dev-lang/nss: fix compile on arm and hppa

Upstream has not accepted this patch yet, but it is reported to fix the same
issue on other platforms and is otherwise benign.

Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1459739
Bug: http://bugs.gentoo.org/655602
Bug: http://bugs.gentoo.org/655636
Closes: https://github.com/gentoo/gentoo/pull/8533

diff --git a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
new file mode 100644 (file)
index 0000000..4a6be4e
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Jan Beich <jbeich@FreeBSD.org>
+# Date 1525728934 0
+# Node ID 259444458a1a7f2ce1813ebe88d924173d5daf0c
+# Parent  5db9e969c74a2a02c4b1d918792827014d1a9d5e
+Bug 1459739 - Build FStar.o on 32-bit ARM even with make. r=fkiefer
+
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -534,16 +534,19 @@ endif # NSS_DISABLE_CHACHAPOLY
+ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
+     # All intel architectures get the 64 bit version
+     # With custom uint128 if necessary (faster than generic 32 bit version).
+     ECL_SRCS += curve25519_64.c
+     VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
+ else
+     # All non intel architectures get the generic 32 bit implementation (slow!)
+     ECL_SRCS += curve25519_32.c
++ifndef NSS_DISABLE_CHACHAPOLY
++        VERIFIED_SRCS += FStar.c
++endif
+ endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+ #######################################################################
+ 
+ include $(CORE_DEPTH)/coreconf/rules.mk
+ 
+
+
+

diff --git a/dev-libs/nss/nss-3.37.ebuild b/dev-libs/nss/nss-3.37.ebuild
index 3a343d29931e9006787f5ad527b32f12535a02f9..0a8ca3ede49271cc03c46140a188d26f4b26e811 100644 (file)
--- a/dev-libs/nss/nss-3.37.ebuild
+++ b/dev-libs/nss/nss-3.37.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
        "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
        "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+       "${FILESDIR}/${P}-fix-fstar-missing-symbols.patch"
 )
 
 src_unpack() {