diff options
| author | tnn <tnn@pkgsrc.org> | 2019-09-19 19:14:39 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-09-19 19:14:39 +0000 |
| commit | 6099d7ae1c60685d78a5296ec0e8507b88aff65f (patch) | |
| tree | 0a53d45148a551333d2383ee77b1bae93e43e94c /devel/nss | |
| parent | 2acdd19a616c81a168690893469cbc029d9b0930 (diff) | |
| download | pkgsrc-6099d7ae1c60685d78a5296ec0e8507b88aff65f.tar.gz | |
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.
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/distinfo | 4 | ||||
| -rw-r--r-- | devel/nss/patches/patch-me | 29 |
2 files changed, 27 insertions, 6 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo index c154ee2fb58..9e36ee0c8b7 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.99 2019/09/06 02:54:47 ryoon Exp $ +$NetBSD: distinfo,v 1.100 2019/09/19 19:14:39 tnn Exp $ SHA1 (nss-3.46.tar.gz) = af1590286cf852702591e5db0ef1ba7b9c1e597c RMD160 (nss-3.46.tar.gz) = 4950f21faeaa0783458b0344056a11e400639e7d @@ -7,7 +7,7 @@ Size (nss-3.46.tar.gz) = 76417155 bytes SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1 -SHA1 (patch-me) = 9da633e494c8656f22162b354d9710a770d24345 +SHA1 (patch-me) = 90310020f28bf57f8c550ecd8dea2d295d4999bd SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709 SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834 SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561 diff --git a/devel/nss/patches/patch-me b/devel/nss/patches/patch-me index b893ef55550..ce08e6c58e7 100644 --- a/devel/nss/patches/patch-me +++ b/devel/nss/patches/patch-me @@ -1,10 +1,31 @@ -$NetBSD: patch-me,v 1.3 2018/01/22 11:43:14 jperkin Exp $ +$NetBSD: patch-me,v 1.4 2019/09/19 19:14:39 tnn Exp $ Add DragonFly support. +Always include GCM for aarch64. ---- nss/lib/freebl/Makefile.orig 2018-01-22 11:22:38.812914721 +0000 +--- nss/lib/freebl/Makefile.orig 2019-08-30 15:46:32.000000000 +0000 +++ nss/lib/freebl/Makefile -@@ -298,7 +298,7 @@ endif +@@ -119,6 +119,9 @@ else + DEFINES += -DNSS_X86 + endif + endif ++ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += gcm-aarch64.c ++endif + + ifeq ($(OS_TARGET),OSF1) + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +@@ -242,9 +245,6 @@ ifeq ($(CPU_ARCH),arm) + DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512 + MPI_SRCS += mpi_arm.c + endif +-ifeq ($(CPU_ARCH),aarch64) +- EXTRA_SRCS += gcm-aarch64.c +-endif + ifeq ($(CPU_ARCH),ppc) + ifdef USE_64 + DEFINES += -DNSS_NO_INIT_SUPPORT +@@ -301,7 +301,7 @@ endif # to bind the blapi function references in FREEBLVector vector # (ldvector.c) to the blapi functions defined in the freebl # shared libraries. @@ -13,7 +34,7 @@ Add DragonFly support. MKSHLIB += -Wl,-Bsymbolic endif -@@ -450,7 +450,11 @@ else +@@ -453,7 +453,11 @@ else ifdef NS_USE_GCC LD = gcc AS = gcc |