| 1 |
commit: 893f2d565c0bc752426907f28a641bec6828574c |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 28 19:05:08 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 28 19:05:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893f2d56 |
| 7 |
|
| 8 |
dev-libs/nss: fix building on PPC |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/722110 |
| 11 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../nss/files/nss-3.53-fix-building-on-ppc.patch | 39 ++++++++++++++++++++++ |
| 15 |
dev-libs/nss/nss-3.52.1-r1.ebuild | 1 + |
| 16 |
dev-libs/nss/nss-3.53.1.ebuild | 1 + |
| 17 |
3 files changed, 41 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..be2d4802c4c |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch |
| 24 |
@@ -0,0 +1,39 @@ |
| 25 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 |
| 26 |
+ |
| 27 |
+From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Lauri Kasanen <cand@×××.com> |
| 29 |
+Date: Mon, 1 Jun 2020 12:11:45 +0300 |
| 30 |
+Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: |
| 31 |
+ ABI version 2 is not compatible with ABI version 1 output |
| 32 |
+ |
| 33 |
+Don't try to build the SHA-2 accelerated asm on old-ABI ppc. |
| 34 |
+ |
| 35 |
+Currently make only, I don't have enough gyp-fu to do that side. |
| 36 |
+However, the reporters of 1642174 and 1635625 both used make, not gyp. |
| 37 |
+ |
| 38 |
+Signed-off-by: Lauri Kasanen <cand@×××.com> |
| 39 |
+--- |
| 40 |
+ lib/freebl/Makefile | 5 ++++- |
| 41 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
| 42 |
+ |
| 43 |
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile |
| 44 |
+index 5f7384429..d01587c7a 100644 |
| 45 |
+--- a/lib/freebl/Makefile |
| 46 |
++++ b/lib/freebl/Makefile |
| 47 |
+@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) |
| 48 |
+ endif |
| 49 |
+ ifeq ($(CPU_ARCH),ppc) |
| 50 |
+ EXTRA_SRCS += gcm-ppc.c |
| 51 |
+- ASFILES += sha512-p8.s |
| 52 |
++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }') |
| 53 |
+ ifdef USE_64 |
| 54 |
+ DEFINES += -DNSS_NO_INIT_SUPPORT |
| 55 |
++ ifeq ($(PPC_ABI),2) |
| 56 |
++ ASFILES += sha512-p8.s |
| 57 |
++ endif |
| 58 |
+ endif # USE_64 |
| 59 |
+ endif # ppc |
| 60 |
+ endif # Linux |
| 61 |
+-- |
| 62 |
+2.19.1 |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild |
| 66 |
index fcd9c6e73a8..56359ce5955 100644 |
| 67 |
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild |
| 68 |
+++ b/dev-libs/nss/nss-3.52.1-r1.ebuild |
| 69 |
@@ -39,6 +39,7 @@ PATCHES=( |
| 70 |
"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" |
| 71 |
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" |
| 72 |
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" |
| 73 |
+ "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" |
| 74 |
) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
|
| 78 |
diff --git a/dev-libs/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild |
| 79 |
index df2971ed709..d94d193dbe9 100644 |
| 80 |
--- a/dev-libs/nss/nss-3.53.1.ebuild |
| 81 |
+++ b/dev-libs/nss/nss-3.53.1.ebuild |
| 82 |
@@ -39,6 +39,7 @@ PATCHES=( |
| 83 |
"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" |
| 84 |
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" |
| 85 |
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" |
| 86 |
+ "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" |
| 87 |
) |
| 88 |
|
| 89 |
src_prepare() { |
Archives