Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1652449236101600"
MIME-Version: 1.0
Date: Fri, 13 May 2022 13:40:36 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/devel/nss
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20220513134036.5A54AFA94@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1652449236101600
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Fri May 13 13:40:36 UTC 2022

Modified Files:
	pkgsrc/devel/nss: distinfo
Added Files:
	pkgsrc/devel/nss/patches: patch-nss_coreconf_Darwin.mk

Log Message:
nss: try to fix macOS/aarch64 to not detect as 32-bit


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1652449236101600
Content-Disposition: inline
Content-Length: 2445
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.152 pkgsrc/devel/nss/distinfo:1.153
--- pkgsrc/devel/nss/distinfo:1.152	Thu Apr 28 11:15:55 2022
+++ pkgsrc/devel/nss/distinfo	Fri May 13 13:40:36 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.152 2022/04/28 11:15:55 wiz Exp $
+$NetBSD: distinfo,v 1.153 2022/05/13 13:40:36 tnn Exp $
 
 BLAKE2s (nss-3.78.tar.gz) = e3b30ce133b04083ff98468d2f4285ce2f740249194e52b86744d4098819f952
 SHA512 (nss-3.78.tar.gz) = ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c
@@ -14,6 +14,7 @@ SHA1 (patch-nss_cmd_platlibs.mk) = 01f43
 SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
 SHA1 (patch-nss_cmd_signtool_certgen.c) = cc81b591df5f0ec0216e626f0bb9d49cf91fff3f
 SHA1 (patch-nss_cmd_signtool_util.c) = 7bf8f7770dbbd3163b9a480b382eda91072e8bc9
+SHA1 (patch-nss_coreconf_Darwin.mk) = 5f40bb2733b88b26a40c5317d1b5edc762dfd18b
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
 SHA1 (patch-nss_lib_certdb_alg1485.c) = 319ecd8bc83f4309fe24267a6b7b8d03f11d06cb

Added files:

Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk:1.3
--- /dev/null	Fri May 13 13:40:36 2022
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk	Fri May 13 13:40:36 2022
@@ -0,0 +1,32 @@
+$NetBSD: patch-nss_coreconf_Darwin.mk,v 1.3 2022/05/13 13:40:36 tnn Exp $
+
+try to fix macOS/aarch64 to not detect as 32-bit
+
+--- nss/coreconf/Darwin.mk.orig	2022-04-28 10:19:37.000000000 +0000
++++ nss/coreconf/Darwin.mk
+@@ -16,6 +16,9 @@ ifndef CPU_ARCH
+ # When cross-compiling, CPU_ARCH should already be defined as the target
+ # architecture, set to powerpc or i386.
+ CPU_ARCH	:= $(shell uname -p)
++  ifeq (arm64, $(shell uname -m))
++    override CPU_ARCH = aarch64
++  endif
+ endif
+ 
+ ifeq (,$(filter-out i%86,$(CPU_ARCH)))
+@@ -33,11 +36,15 @@ else
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
++ifeq (aarch64,$(CPU_ARCH))
++# Nothing set for arm currently.
++else
+ OS_REL_CFLAGS	= -Dppc
+ CC              += -arch ppc
+ CCC             += -arch ppc
+ endif
+ endif
++endif
+ 
+ ifneq (,$(MACOS_SDK_DIR))
+     GCC_VERSION_FULL := $(shell $(CC) -dumpversion)


--_----------=_1652449236101600--