Thu Sep 19 19:14:39 2019 UTC ()
nss: aarch64 build fix

From OpenBSD. Similar to PR pkg/53353 for ARM. Although different symbols
missing in that case and that's believed to be fixed already.


(tnn)
diff -r1.99 -r1.100 pkgsrc/devel/nss/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/nss/patches/patch-me
cvs diff -r1.99 -r1.100 pkgsrc/devel/nss/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nss/distinfo 2019/09/06 02:54:47 1.99
+++ pkgsrc/devel/nss/distinfo 2019/09/19 19:14:39 1.100
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.99 2019/09/06 02:54:47 ryoon Exp $ 1$NetBSD: distinfo,v 1.100 2019/09/19 19:14:39 tnn Exp $
2 2
3SHA1 (nss-3.46.tar.gz) = af1590286cf852702591e5db0ef1ba7b9c1e597c 3SHA1 (nss-3.46.tar.gz) = af1590286cf852702591e5db0ef1ba7b9c1e597c
4RMD160 (nss-3.46.tar.gz) = 4950f21faeaa0783458b0344056a11e400639e7d 4RMD160 (nss-3.46.tar.gz) = 4950f21faeaa0783458b0344056a11e400639e7d
5SHA512 (nss-3.46.tar.gz) = de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48 5SHA512 (nss-3.46.tar.gz) = de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
6Size (nss-3.46.tar.gz) = 76417155 bytes 6Size (nss-3.46.tar.gz) = 76417155 bytes
7SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca 7SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
8SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69 8SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
9SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1 9SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
10SHA1 (patch-me) = 9da633e494c8656f22162b354d9710a770d24345 10SHA1 (patch-me) = 90310020f28bf57f8c550ecd8dea2d295d4999bd
11SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709 11SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
12SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834 12SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
13SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561 13SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561
14SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a 14SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
15SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4 15SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
16SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6 16SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
17SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754 17SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
18SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078 18SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
19SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b 19SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b
20SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb 20SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
21SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071 21SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
22SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7 22SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
23SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af 23SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
cvs diff -r1.3 -r1.4 pkgsrc/devel/nss/patches/patch-me (expand / switch to unified diff)

--- pkgsrc/devel/nss/patches/patch-me 2018/01/22 11:43:14 1.3
+++ pkgsrc/devel/nss/patches/patch-me 2019/09/19 19:14:39 1.4
@@ -1,27 +1,48 @@ @@ -1,27 +1,48 @@
1$NetBSD: patch-me,v 1.3 2018/01/22 11:43:14 jperkin Exp $ 1$NetBSD: patch-me,v 1.4 2019/09/19 19:14:39 tnn Exp $
2 2
3Add DragonFly support. 3Add DragonFly support.
 4Always include GCM for aarch64.
4 5
5--- nss/lib/freebl/Makefile.orig 2018-01-22 11:22:38.812914721 +0000 6--- nss/lib/freebl/Makefile.orig 2019-08-30 15:46:32.000000000 +0000
6+++ nss/lib/freebl/Makefile 7+++ nss/lib/freebl/Makefile
7@@ -298,7 +298,7 @@ endif 8@@ -119,6 +119,9 @@ else
 9 DEFINES += -DNSS_X86
 10 endif
 11 endif
 12+ifeq ($(CPU_ARCH),aarch64)
 13+ EXTRA_SRCS += gcm-aarch64.c
 14+endif
 15
 16 ifeq ($(OS_TARGET),OSF1)
 17 DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
 18@@ -242,9 +245,6 @@ ifeq ($(CPU_ARCH),arm)
 19 DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
 20 MPI_SRCS += mpi_arm.c
 21 endif
 22-ifeq ($(CPU_ARCH),aarch64)
 23- EXTRA_SRCS += gcm-aarch64.c
 24-endif
 25 ifeq ($(CPU_ARCH),ppc)
 26 ifdef USE_64
 27 DEFINES += -DNSS_NO_INIT_SUPPORT
 28@@ -301,7 +301,7 @@ endif
8 # to bind the blapi function references in FREEBLVector vector 29 # to bind the blapi function references in FREEBLVector vector
9 # (ldvector.c) to the blapi functions defined in the freebl 30 # (ldvector.c) to the blapi functions defined in the freebl
10 # shared libraries. 31 # shared libraries.
11-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) 32-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
12+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) 33+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
13 MKSHLIB += -Wl,-Bsymbolic 34 MKSHLIB += -Wl,-Bsymbolic
14 endif 35 endif
15  36
16@@ -450,7 +450,11 @@ else 37@@ -453,7 +453,11 @@ else
17 ifdef NS_USE_GCC 38 ifdef NS_USE_GCC
18 LD = gcc 39 LD = gcc
19 AS = gcc 40 AS = gcc
20+ ifdef CC_IS_CLANG 41+ ifdef CC_IS_CLANG
21+ ASFLAGS = -no-integrated-as 42+ ASFLAGS = -no-integrated-as
22+ else 43+ else
23 ASFLAGS = -x assembler-with-cpp 44 ASFLAGS = -x assembler-with-cpp
24+ endif 45+ endif
25 endif 46 endif
26 ifeq ($(USE_64),1) 47 ifeq ($(USE_64),1)
27 # Solaris for AMD64 48 # Solaris for AMD64