<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/fe8400298019208918da73a23eea0eb51027f8fd">https://github.com/macports/macports-ports/commit/fe8400298019208918da73a23eea0eb51027f8fd</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 fe840029801 nss: specify CPU_ARCH
</span>fe840029801 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fe8400298019208918da73a23eea0eb51027f8fd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jan 10 07:24:11 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> nss: specify CPU_ARCH
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Should fix build on arm64 and probably also building for i386 on x86_64
</span><span style='display:block; white-space:pre;color:#404040;'> systems.
</span>---
net/nss/Portfile | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nss/Portfile b/net/nss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2036c0b544e..08eaaf8c0e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,18 +108,27 @@ configure.cflags-append -std=c99
</span>
# mimic nss/coreconf/Darwin.mk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+array set cpu_arch_map [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64 aarch64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 x86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 x86_64]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset universal]} {
if {${configure.build_arch} in [list arm64 ppc64 x86_64]} {
build.args-append USE_64=1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists cpu_arch_map(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CPU_ARCH=$cpu_arch_map(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
build.args-append \
CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]" \
CCC="${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(arm64) USE_64=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_args(arm64) USE_64=1 CPU_ARCH=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_args(i386) CPU_ARCH=x86
</span> lappend merger_build_args(ppc64) USE_64=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(x86_64) USE_64=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_args(x86_64) USE_64=1 CPU_ARCH=x86_64
</span>
foreach arch ${universal_archs} {
lappend merger_build_args(${arch}) \
</pre><pre style='margin:0'>
</pre>