summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2018-03-05 15:22:35 -0500
committerIan Stakenvicius <axs@gentoo.org>2018-03-05 15:47:16 -0500
commit6a151dad6741ecc70051f8269f78ebfe7dcbe0d3 (patch)
treef8aab6f336b517f259e26c7a5c94732fc97b78a6 /dev-libs/nss
parentwww-client/chromium: strip unsupported flags when overriding CXX (diff)
downloadgentoo-6a151dad6741ecc70051f8269f78ebfe7dcbe0d3.tar.gz
gentoo-6a151dad6741ecc70051f8269f78ebfe7dcbe0d3.tar.bz2
gentoo-6a151dad6741ecc70051f8269f78ebfe7dcbe0d3.zip
dev-libs/nss: fix compilation on amd64 of v3.35
Upstream fixed in 3.36 and backported to 3.35 (unreleased) via https://bugzilla.mozilla.org/show_bug.cgi?id=1432455 Bug: http://bugs.gentoo.org/646382 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-libs/nss')
-rw-r--r--dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch36
-rw-r--r--dev-libs/nss/nss-3.35.ebuild3
2 files changed, 39 insertions, 0 deletions
diff --git a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
new file mode 100644
index 000000000000..c05d103e25ba
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User Daiki Ueno <dueno@redhat.com>
+# Date 1516710574 -3600
+# Node ID 74e679158d1bfe05c173e995ae7dc5a05ae02fe0
+# Parent b3feffd76f4714139f72369f82b28619a704dbd6
+Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY
+
+ ifneq (1,$(CC_IS_GCC))
+ EXTRA_SRCS += chacha20.c
+ VERIFIED_SRCS += Hacl_Chacha20.c
+ else
+ EXTRA_SRCS += chacha20_vec.c
+ endif
+ else
+- EXTRA_SRCS += poly1305.c
++ ifeq ($(CPU_ARCH),aarch64)
++ EXTRA_SRCS += Hacl_Poly1305_64.c
++ else
++ EXTRA_SRCS += poly1305.c
++ endif
++
+ EXTRA_SRCS += chacha20.c
+ VERIFIED_SRCS += Hacl_Chacha20.c
+ endif # x86_64
+ 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).
+
diff --git a/dev-libs/nss/nss-3.35.ebuild b/dev-libs/nss/nss-3.35.ebuild
index d21c8184ed40..dac240facdf1 100644
--- a/dev-libs/nss/nss-3.35.ebuild
+++ b/dev-libs/nss/nss-3.35.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
"${DISTDIR}/${PN}-cacert-class1-class3.patch"
)
fi
+ # bug 646382
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1432455
+ PATCHES+=( "${FILESDIR}"/${P}-Hacl_Poly1305_64-aarch64.patch )
default