<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/24a602ff132746a28df4eef2424ffe7e7a8065f9">https://github.com/macports/macports-ports/commit/24a602ff132746a28df4eef2424ffe7e7a8065f9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 24a602ff132746a28df4eef2424ffe7e7a8065f9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Mar 4 01:37:25 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> portgroups: use configure.build_arch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> $build_arch contains the arch that the user configured in macports.conf
</span><span style='display:block; white-space:pre;color:#404040;'> or the default arch for the current platform if none was configured,
</span><span style='display:block; white-space:pre;color:#404040;'> while ${configure.build_arch} contains the arch that the port is
</span><span style='display:block; white-space:pre;color:#404040;'> being built for. The two can differ if the port's supported_archs do
</span><span style='display:block; white-space:pre;color:#404040;'> not include $build_arch. In that case, the arch can undergo a
</span><span style='display:block; white-space:pre;color:#404040;'> "demotion" to a different arch supported by the port that will run on
</span><span style='display:block; white-space:pre;color:#404040;'> the current platform, e.g. arm64 to x86_64, or x86_64 to i386.
</span>---
_resources/port1.0/group/cargo_fetch-1.0.tcl | 10 +++++-----
_resources/port1.0/group/cxx11-1.1.tcl | 2 +-
_resources/port1.0/group/golang-1.0.tcl | 2 +-
_resources/port1.0/group/octave-1.0.tcl | 6 +++---
_resources/port1.0/group/qmake5-1.0.tcl | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo_fetch-1.0.tcl b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c6d23a0dff..62dd2dc278b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,12 +220,12 @@ proc cargo.translate_arch_name {arch} {
</span> }
proc cargo.rust_platform {{arch ""}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform build_arch muniversal.current_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.platform configure.build_arch muniversal.current_arch
</span> if {${arch} eq ""} {
if {[info exists muniversal.current_arch]} {
set arch ${muniversal.current_arch}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch ${configure.build_arch}
</span> }
}
return [cargo.translate_arch_name ${arch}]-apple-${os.platform}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,7 +243,7 @@ foreach stage {configure build destroot} {
</span>
# do not force all Portfiles to switch from ${stage}.env to ${stage}.env-append
proc cargo.environments {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.cc configure.cxx subport build_arch configure.universal_archs merger_configure_env merger_build_env merger_destroot_env worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.cc configure.cxx subport configure.build_arch configure.universal_archs merger_configure_env merger_build_env merger_destroot_env worksrcpath
</span> foreach stage {build destroot} {
${stage}.env-delete CC=${configure.cc} \
CXX=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,9 +262,9 @@ proc cargo.environments {} {
</span> if {![variant_exists universal] || ![variant_isset universal]} {
foreach stage {configure build destroot} {
${stage}.env-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=[cargo.rust_platform ${configure.build_arch}]
</span> ${stage}.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=[cargo.rust_platform ${configure.build_arch}]
</span> }
} else {
foreach stage {configure build destroot} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cxx11-1.1.tcl b/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 895c9dd4a1e..bc7e1d872f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ if {${configure.cxx_stdlib} eq "libstdc++"} {
</span> # do not force all Portfiles to switch from depends_lib to depends_lib-append
port::register_callback cxx11.add_dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {(${os.platform} eq "darwin" && ${os.major} < 10) || ${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${os.platform} eq "darwin" && ${os.major} < 10) || ${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
</span> # ports will build with gcc6, gcc4ABI-compatible
pre-configure {
ui_msg "C++11 ports are compiling with GCC. EXPERIMENTAL."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 31d4e0a5403..970dd1225b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +129,7 @@ platforms darwin freebsd linux
</span> supported_archs i386 x86_64
set goos ${os.platform}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+switch ${configure.build_arch} {
</span> i386 { set goarch 386 }
x86_64 { set goarch amd64 }
default { set goarch {} }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e3c1dcd7044..b0fbd609f16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,12 +122,12 @@ pre-configure {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append OCTAVE_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append OCTAVE_ARCH=${configure.build_arch}
</span> configure.args \
"'try; pkg build -verbose -nodeps ${workpath}/tmp-build ${workpath}/${distname}.tar.gz; catch; disp(lasterror.message); exit(1); end_try_catch;'"
# fortran arch flag is not set automatically
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
</span> configure.fflags-append -m64
} else {
configure.fflags-append -m32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +187,7 @@ pre-destroot {
</span> set octave_install_lib ${destroot}${prefix}/lib/octave/packages
set octave_tgz_file ${workpath}/tmp-build/[exec /bin/ls ${workpath}/tmp-build]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append OCTAVE_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append OCTAVE_ARCH=${configure.build_arch}
</span>
destroot.args \
"'try; pkg prefix ${octave_install_share} ${octave_install_lib}; pkg install -verbose -nodeps -local ${octave_tgz_file}; catch; disp(lasterror.message); exit(1); end_try_catch;'"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 55dcdda15c9..8a6c361cacc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ pre-configure {
</span> if {[variant_exists universal] && [variant_isset universal]} {
puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.universal_archs}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.build_arch}"
</span> }
} else {
#
</pre><pre style='margin:0'>
</pre>