<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fa074bf12c6d4b55dc95f9c1c3676c7e7b838ba">https://github.com/macports/macports-ports/commit/4fa074bf12c6d4b55dc95f9c1c3676c7e7b838ba</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4fa074bf12c muniversal-1.0.tcl: Use eq/ne for string comparisons
</span>4fa074bf12c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fa074bf12c6d4b55dc95f9c1c3676c7e7b838ba
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 10 10:06:38 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> muniversal-1.0.tcl: Use eq/ne for string comparisons
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And use in/ni and lists where appropriate.
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 102 ++++++++++++++--------------
1 file changed, 51 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dc1fafdb71b..a6849785f2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,21 +41,21 @@ proc muniversal_arch_flag_supported {args} {
</span> proc muniversal_get_arch_flag {arch {fortran ""}} {
global os.arch
# Prefer -arch to -m
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[muniversal_arch_flag_supported] && ${fortran}==""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[muniversal_arch_flag_supported] && ${fortran} eq ""} {
</span> set archf "-arch ${arch}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch}=="i386" && ${arch}=="i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "i386" && ${arch} eq "i386"} {
</span> set archf -m32
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.arch}=="i386" && ${arch}=="x86_64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.arch} eq "i386" && ${arch} eq "x86_64"} {
</span> set archf -m64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.arch} eq "powerpc" && ${arch} eq "ppc"} {
</span> set archf -m32
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.arch} eq "powerpc" && ${arch} eq "ppc64"} {
</span> set archf -m64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.arch}=="arm" && ${arch}=="arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.arch} eq "arm" && ${arch} eq "arm64"} {
</span> set archf -m64
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${fortran}=="" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fortran} eq ""} {
</span> return -code error "selected compiler can't build for ${arch}"
} else {
return ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,12 +116,12 @@ variant universal {
</span> }
# user has specified that build platform must be able to run binaries for supported architectures
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${merger_must_run_binaries}=="yes" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.arch}=="arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${merger_must_run_binaries} eq "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "arm"} {
</span> set universal_archs_supported [ldelete ${universal_archs_supported} "ppc"]
set universal_archs_supported [ldelete ${universal_archs_supported} "ppc64"]
set universal_archs_supported [ldelete ${universal_archs_supported} "i386"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.arch}=="i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.arch} eq "i386"} {
</span> set universal_archs_supported [ldelete ${universal_archs_supported} "ppc64"]
set universal_archs_supported [ldelete ${universal_archs_supported} "arm64"]
if {${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,38 +142,38 @@ variant universal {
</span> foreach arch ${universal_archs} {
set arch_ok no
foreach archt ${universal_archs_supported} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch}==${archt} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq ${archt}} {
</span> set arch_ok yes
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch_ok}=="yes" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch_ok} eq "yes"} {
</span> lappend universal_archs_to_use ${arch}
}
}
# if merger_no_3_archs is yes, prune universal_archs_to_use until it only has two elements
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${merger_no_3_archs}=="yes" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${merger_no_3_archs} eq "yes"} {
</span> if { [llength ${universal_archs_to_use}] >= 3 } {
# First, try to remove ppc64 unless we're powerpc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} != "powerpc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} ne "powerpc"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "ppc64"]
}
}
if { [llength ${universal_archs_to_use}] >= 3 } {
# Next, delete archs that are not evolutionarilary adjacent
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} == "powerpc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "powerpc"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "arm64"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if {${os.arch} == "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if {${os.arch} eq "arm"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "ppc"]
}
}
if { [llength ${universal_archs_to_use}] >= 3 } {
# Next continue to prune architectures that are not evolutionarilary adjacent
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} == "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "arm"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "i386"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if { ${os.arch} == "powerpc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if {${os.arch} eq "powerpc"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "x86_64"]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,9 +184,9 @@ variant universal {
</span>
if { [llength ${universal_archs_to_use}] >= 3 } {
# Lastly, remove remaining cross-compiled arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} == "powerpc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "powerpc"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "i386"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if { ${os.arch} == "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if {${os.arch} eq "i386"} {
</span> set universal_archs_to_use [ldelete ${universal_archs_to_use} "ppc"]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,7 +198,7 @@ variant universal {
</span> }
# if Portfile has configure {...}, save the procedure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.configure-configure-0] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.configure-configure-0] ne ""} {
</span> rename userproc-org.macports.configure-configure-0 userproc-org.macports.configure-configure-1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,7 +249,7 @@ variant universal {
</span> set archf [muniversal_get_arch_flag ${arch}]
set archff [muniversal_get_arch_flag ${arch} "fortran"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${merger_arch_flag} != "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${merger_arch_flag} ne "no"} {
</span> configure.cflags-append ${archf}
configure.cxxflags-append ${archf}
configure.objcflags-append ${archf}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,13 +271,13 @@ variant universal {
</span> # Don't set the --host unless we have to.
set host ""
if { [info exists merger_host($arch)] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $merger_host($arch) != "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$merger_host($arch) ne ""} {
</span> set host --host=$merger_host($arch)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[file tail ${configure.cmd}] != "cmake"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[file tail ${configure.cmd}] ne "cmake"} {
</span> # check if building for a word length we can't run
set bits_differ 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {(${arch}=="x86_64" || ${arch}=="ppc64") &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} in [list ppc64 x86_64] &&
</span> (${os.major} < 9 || [sysctl hw.cpu64bit_capable] == 0)} {
set bits_differ 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,9 +289,9 @@ variant universal {
</span>
# check if building for a completely different arch
if {$bits_differ || $config_guess_bug
<span style='display:block; white-space:pre;background:#ffe0e0;'>- || (${os.arch}=="arm" && (${arch}=="i386" || ${arch}=="x86_64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (${os.arch}=="i386" && (${arch}=="arm64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (${os.arch}=="powerpc" && (${arch}=="i386" || ${arch}=="x86_64"))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch} eq "arm" && ${arch} in [list i386 ppc ppc64 x86_64])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch} eq "i386" && ${arch} in [list arm64 ppc ppc64])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch} eq "powerpc" && ${arch} in [list i386 x86_64])} {
</span> switch -- ${arch} {
arm64 {set host "--host=aarch64-apple-${os.platform}${os.version}"}
x86_64 {set host "--host=x86_64-apple-${os.platform}${os.version}"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,7 +301,7 @@ variant universal {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$host != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$host ne ""} {
</span> configure.args-append ${host}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,13 +327,13 @@ variant universal {
</span> configure.fc [portconfigure::configure_get_compiler fc]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${merger_arch_compiler} != "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${merger_arch_compiler} ne "no"} {
</span> configure.cc ${configure.cc} ${archf}
configure.cxx ${configure.cxx} ${archf}
configure.objc ${configure.objc} ${archf}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.fc} != "" } { configure.fc ${configure.fc} ${archff} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.f77} != "" } { configure.f77 ${configure.f77} ${archff} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.f90} != "" } { configure.f90 ${configure.f90} ${archff} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.fc} ne ""} {configure.fc ${configure.fc} ${archff}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.f77} ne ""} {configure.f77 ${configure.f77} ${archff}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.f90} ne ""} {configure.f90 ${configure.f90} ${archff}}
</span> }
set configure_dir_save ${configure.dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -372,7 +372,7 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.configure-configure-1] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.configure-configure-1] ne ""} {
</span> set worksrcpath_save ${worksrcpath}
option worksrcpath ${worksrcpath}-${arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,7 +411,7 @@ variant universal {
</span> if { [info exists merger_configure_env(${arch})] } {
configure.env-delete {*}$merger_configure_env(${arch})
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${merger_arch_flag} != "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${merger_arch_flag} ne "no"} {
</span> configure.ldflags-delete ${archf}
configure.f90flags-delete ${archff}
configure.fcflags-delete ${archff}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,7 +426,7 @@ variant universal {
</span> }
# if Portfile has build {...}, save the procedure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.build-build-0] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.build-build-0] ne ""} {
</span> rename userproc-org.macports.build-build-0 userproc-org.macports.build-build-1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,7 +461,7 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.build-build-1] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.build-build-1] ne ""} {
</span> set worksrcpath_save ${worksrcpath}
option worksrcpath ${worksrcpath}-${arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -485,7 +485,7 @@ variant universal {
</span> }
# if Portfile has destroot {...}, save the procedure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.destroot-destroot-0] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.destroot-destroot-0] ne ""} {
</span> rename userproc-org.macports.destroot-destroot-0 userproc-org.macports.destroot-destroot-1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -525,7 +525,7 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs userproc-org.macports.destroot-destroot-1] != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs userproc-org.macports.destroot-destroot-1] ne ""} {
</span> set worksrcpath_save ${worksrcpath}
option worksrcpath ${worksrcpath}-${arch}
set destroot_save ${destroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -557,14 +557,14 @@ variant universal {
</span>
set ditem ${org.macports.destroot}
set procedure [ditem_key $ditem merger-post]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$procedure != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$procedure ne ""} {
</span> set targetname [ditem_key $ditem name]
ui_debug "Executing org.macports.merger-post-destroot"
set result [catch { $procedure $targetname } errstr]
# Save variables in order to re-throw the same error code.
set errcode $::errorCode
set errinfo $::errorInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result ne 0} {
</span> set portname $subport
ui_error "$targetname for port $portname returned: $errstr"
ui_debug "Error code: $errcode"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -610,7 +610,7 @@ variant universal {
</span> xinstall -d -m 0755 ${dir}
foreach fl [glob -directory ${dir2} -tails -nocomplain * .*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${fl} == "." || ${fl} == ".." } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fl} in [list . ..]} {
</span> continue
}
if { ![muniversal_file_or_symlink_exists ${dir1}/${fl}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,7 +620,7 @@ variant universal {
</span> }
}
foreach fl [glob -directory ${dir1} -tails -nocomplain * .*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${fl} == "." || ${fl} == ".." } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fl} in [list . ..]} {
</span> continue
}
if { ![muniversal_file_or_symlink_exists ${dir2}/${fl}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,16 +632,16 @@ variant universal {
</span> ui_debug "universal: merge: merging ${prefixDir}/${fl} from ${base1} and ${base2}"
# Ensure files are of same type
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file type ${dir1}/${fl}]!=[file type ${dir2}/${fl}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file type ${dir1}/${fl}] ne [file type ${dir2}/${fl}]} {
</span> error "${dir1}/${fl} and ${dir2}/${fl} are of different types"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file type ${dir1}/${fl}]=="link" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file type ${dir1}/${fl}] eq "link"} {
</span> # Files are links
ui_debug "universal: merge: ${prefixDir}/${fl} is a link"
# Ensure links don't point to different things
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file readlink ${dir1}/${fl}]==[file readlink ${dir2}/${fl}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file readlink ${dir1}/${fl}] eq [file readlink ${dir2}/${fl}]} {
</span> copy ${dir1}/${fl} ${dir}
} else {
error "${dir1}/${fl} and ${dir2}/${fl} point to different targets (can't merge them)"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -667,11 +667,11 @@ variant universal {
</span> # lipo and libtool have failed, so assume they are text files to be merged
set dontdiff no
foreach dont ${merger_dont_diff} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${dont}=="${prefixDir}/${fl}" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${dont} eq "${prefixDir}/${fl}"} {
</span> set dontdiff yes
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${dontdiff}==yes } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${dontdiff} eq yes} {
</span> # user has specified that diff does not work
# attempt to give each file a unique name and create a new file which includes one of the original depending on the arch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,7 +698,7 @@ variant universal {
</span> # To find these modules, GFortran might require -M or -J.
file mkdir ${dir}/mods32
file mkdir ${dir}/mods64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch1}=="i386" || ${arch1}=="ppc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch1} in [list i386 ppc]} {
</span> copy ${dir1}/${fl} ${dir}/mods32
copy ${dir2}/${fl} ${dir}/mods64
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -712,7 +712,7 @@ variant universal {
</span> }
*.la {
global destroot.delete_la_files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${destroot.delete_la_files} == "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${destroot.delete_la_files} eq "yes"} {
</span> ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; ignoring due to delete_la_files"
} else {
return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -860,7 +860,7 @@ variant universal {
</span> foreach arch ${universal_archs_to_use} {
# Rosetta does not translate G5 instructions
# PowerPC systems can't translate Intel instructions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (${os.arch}=="i386" && ${arch}!="ppc64") || (${os.arch}=="powerpc" && ${arch}!="i386" && ${arch}!="x86_64") } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${os.arch} eq "i386" && ${arch} ne "ppc64") || (${os.arch} eq "powerpc" && ${arch} ni [list i386 x86_64])} {
</span> ui_info "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] ${subport} ${arch}]"
if { [info exists merger_test_env(${arch})] } {
</pre><pre style='margin:0'>
</pre>