CVS commit: pkgsrc/devel/nss

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr 26 21:43:43 UTC 2020

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

Log Message:
nss: fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7hf

Fixes PR pkg/53353 and maybe also PR pkg/55158


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk

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.111 pkgsrc/devel/nss/distinfo:1.112
--- pkgsrc/devel/nss/distinfo:1.111     Sun Apr 12 15:13:33 2020
+++ pkgsrc/devel/nss/distinfo   Sun Apr 26 21:43:43 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2020/04/12 15:13:33 tnn Exp $
+$NetBSD: distinfo,v 1.112 2020/04/26 21:43:43 tnn Exp $
 
 SHA1 (nss-3.51.tar.gz) = f1d46871728cd5afc81ec07d9833bb2b8c4fa68f
 RMD160 (nss-3.51.tar.gz) = f35fa4a2439f8ec3d2f23c575cfa1d5c7cfe48ef
@@ -14,6 +14,7 @@ SHA1 (patch-mh) = a46d3098a85c3a4a57895a
 SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
+SHA1 (patch-nss_coreconf_NetBSD.mk) = ed95aa1c245c9f2b8fda0a1769f9599223b61dbf
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
 SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7

Added files:

Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.1
--- /dev/null   Sun Apr 26 21:43:43 2020
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk       Sun Apr 26 21:43:43 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.1 2020/04/26 21:43:43 tnn Exp $
+
+fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f
+
+--- nss/coreconf/NetBSD.mk.orig        2020-03-06 18:44:20.000000000 +0000
++++ nss/coreconf/NetBSD.mk
+@@ -15,6 +15,9 @@ ifeq ($(CPU_ARCH),i386)
+ OS_REL_CFLAGS         = -Di386
+ CPU_ARCH              = x86
+ endif
++ifeq (,$(filter-out earm%,$(CPU_ARCH)))
++CPU_ARCH              = arm
++endif
+ 
+ ifndef OBJECT_FMT
+ OBJECT_FMT            := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)