CVS commit: pkgsrc/devel/nss

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Sep 19 19:14:39 UTC 2019

Modified Files:
        pkgsrc/devel/nss: distinfo
        pkgsrc/devel/nss/patches: patch-me

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/nss/patches/patch-me

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

Modified files:

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.99 pkgsrc/devel/nss/distinfo:1.100
--- pkgsrc/devel/nss/distinfo:1.99      Fri Sep  6 02:54:47 2019
+++ pkgsrc/devel/nss/distinfo   Thu Sep 19 19:14:39 2019
@@ -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

Index: pkgsrc/devel/nss/patches/patch-me
diff -u pkgsrc/devel/nss/patches/patch-me:1.3 pkgsrc/devel/nss/patches/patch-me:1.4
--- pkgsrc/devel/nss/patches/patch-me:1.3       Mon Jan 22 11:43:14 2018
+++ pkgsrc/devel/nss/patches/patch-me   Thu Sep 19 19:14:39 2019
@@ -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