<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/3b13b5d51f6055cde20d4cb808986040af983834">https://github.com/macports/macports-base/commit/3b13b5d51f6055cde20d4cb808986040af983834</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 3b13b5d5 followup universal adjustments
</span>3b13b5d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b13b5d51f6055cde20d4cb808986040af983834
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 29 05:16:04 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> followup universal adjustments
</span>---
src/macports1.0/macports.tcl | 2 +-
src/port1.0/portutil.tcl | 28 ++++------------------------
2 files changed, 5 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e1bfbc4a..7849f3ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1118,7 +1118,7 @@ match macports.conf.default."
</span> set macports::universal_archs {i386 ppc}
}
} elseif {[llength $macports::universal_archs] < 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_major < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_major < 18 || $os_major > 19} {
</span> ui_warn "invalid universal_archs configured (should contain at least 2 archs)"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fbf8af72..a57d73f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3227,7 +3227,7 @@ proc get_canonical_archs {} {
</span> global supported_archs os.arch configure.build_arch configure.universal_archs
if {$supported_archs eq "noarch"} {
return "noarch"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_exists universal] && [variant_isset universal] && [llength ${configure.universal_archs}] >= 2} {
</span> return [lsort -ascii ${configure.universal_archs}]
} elseif {${configure.build_arch} ne ""} {
return ${configure.build_arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3238,7 +3238,7 @@ proc get_canonical_archs {} {
</span>
# returns the flags that should be passed to the compiler to choose arch(s)
proc get_canonical_archflags {{tool cc}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_exists universal] || ![variant_isset universal] || [llength [option configure.universal_archs]] < 2} {
</span> if {[catch {option configure.${tool}_archflags} flags]} {
return -code error "archflags do not exist for tool '$tool'"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3259,28 +3259,8 @@ proc check_supported_archs {} {
</span> if {$supported_archs eq "noarch"} {
return 0
} elseif {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength ${configure.universal_archs}] > 1 || $universal_archs eq ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set unsupported ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$supported_archs ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch $universal_archs {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$arch ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set unsupported $arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$unsupported ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$subport cannot be installed for the configured universal_archs '$universal_archs' because it only supports the arch(s) '$supported_archs'."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch $universal_archs {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$arch ni ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend unsupported $arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$subport cannot be installed for the configured universal_archs '$universal_archs' because the arch(s) '$unsupported' are not supported."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # universal variant would not exist if < 2 universal_archs were supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0
</span> } elseif {$build_arch eq "" || ${configure.build_arch} ne ""} {
return 0
} elseif {$supported_archs ne "" && $build_arch ni $supported_archs} {
</pre><pre style='margin:0'>
</pre>