diff options
| author |   stefson <herrtimson@yahoo.de> | 2018-05-23 19:13:05 +0200 |
|---|---|---|
| committer |   Ian Stakenvicius <axs@gentoo.org> | 2018-05-23 16:06:33 -0400 |
| commit | 16e4471e4327d02cd19dd5001f5a76e71fec3686 (patch) | |
| tree | 9a62d53b068efe5166f302894fff63dbbc0f2330 /dev-libs/nss | |
| parent | x11-libs/libxshmfence: Revision bump to force a rebuild (diff) | |
| download | gentoo-16e4471e4327d02cd19dd5001f5a76e71fec3686.tar.gz gentoo-16e4471e4327d02cd19dd5001f5a76e71fec3686.tar.bz2 gentoo-16e4471e4327d02cd19dd5001f5a76e71fec3686.zip | |
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
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch | 34 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.37.ebuild | 1 |
2 files changed, 35 insertions, 0 deletions
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 index 000000000000..4a6be4e90cd8 --- /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 3a343d29931e..0a8ca3ede492 100644 --- 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() { |