<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e3a138b8b78871dd2a783a062596d2652787d2b">https://github.com/macports/macports-ports/commit/2e3a138b8b78871dd2a783a062596d2652787d2b</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 2e3a138b8b7 clang-11-bootstrap: prefer configure.build_arch over build_arch, use universal_possible
</span>2e3a138b8b7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e3a138b8b78871dd2a783a062596d2652787d2b
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Nov 28 22:55:28 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> clang-11-bootstrap: prefer configure.build_arch over build_arch, use universal_possible
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68789
</span>---
lang/clang-11-bootstrap/Portfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/Portfile b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df9c9e2b16f..1847d1cd04f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.0
</span> name clang-11-bootstrap
version 11.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> epoch 0
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +210,7 @@ configure.args-append \
</span> -DLLVM_INCLUDE_UTILS=OFF \
-DPYTHON_EXECUTABLE=${prefix}/libexec/python27-bootstrap/bin/python2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} eq "arm64"} {
</span> configure.args-append \
-DLLVM_TARGETS_TO_BUILD="AArch64\;X86"
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,12 +272,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span>
set gcc [open "${workpath}/bins/gcc" w 0755]
puts ${gcc} "#!/bin/sh"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${gcc} "arch -arch $\{BUILD_ARCH:-${build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/gcc \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${gcc} "arch -arch $\{BUILD_ARCH:-${configure.build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/gcc \"\$@\""
</span> close ${gcc}
set gxx [open "${workpath}/bins/g++" w 0755]
puts ${gxx} "#!/bin/sh"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${gxx} "arch -arch $\{BUILD_ARCH:-${build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/g++ \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${gxx} "arch -arch $\{BUILD_ARCH:-${configure.build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/g++ \"\$@\""
</span> close ${gxx}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,7 +349,7 @@ post-patch {
</span> }
}
<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 {${universal_possible} && [variant_isset universal]} {
</span> foreach arch ${universal_archs_supported} {
lappend merger_configure_env(${arch}) BUILD_ARCH=${arch}
lappend merger_build_env(${arch}) BUILD_ARCH=${arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,8 +358,8 @@ if {[variant_exists universal] && [variant_isset universal]} {
</span> -DDARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS=${arch}
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCOMPILER_RT_TOOLCHAIN_ARCHES=${build_arch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_RT_TOOLCHAIN_ARCHES=${configure.build_arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS=${configure.build_arch}
</span> }
merger_arch_flag yes
</pre><pre style='margin:0'>
</pre>