diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-06-28 21:05:08 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-06-28 21:05:19 +0200 |
| commit | 893f2d565c0bc752426907f28a641bec6828574c (patch) | |
| tree | 875c0dbbe4d6165ed2f144db5efaffbb84db8fd0 /dev-libs/nss | |
| parent | kde-frameworks/solid: add missing bison and flex dependencies (diff) | |
| download | gentoo-893f2d565c0bc752426907f28a641bec6828574c.tar.gz gentoo-893f2d565c0bc752426907f28a641bec6828574c.tar.bz2 gentoo-893f2d565c0bc752426907f28a641bec6828574c.zip | |
dev-libs/nss: fix building on PPC
Closes: https://bugs.gentoo.org/722110
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch | 39 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.52.1-r1.ebuild | 1 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.53.1.ebuild | 1 |
3 files changed, 41 insertions, 0 deletions
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 new file mode 100644 index 000000000000..be2d4802c4c2 --- /dev/null +++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch @@ -0,0 +1,39 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 + +From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001 +From: Lauri Kasanen <cand@gmx.com> +Date: Mon, 1 Jun 2020 12:11:45 +0300 +Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: + ABI version 2 is not compatible with ABI version 1 output + +Don't try to build the SHA-2 accelerated asm on old-ABI ppc. + +Currently make only, I don't have enough gyp-fu to do that side. +However, the reporters of 1642174 and 1635625 both used make, not gyp. + +Signed-off-by: Lauri Kasanen <cand@gmx.com> +--- + lib/freebl/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +index 5f7384429..d01587c7a 100644 +--- a/lib/freebl/Makefile ++++ b/lib/freebl/Makefile +@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) + endif + ifeq ($(CPU_ARCH),ppc) + EXTRA_SRCS += gcm-ppc.c +- ASFILES += sha512-p8.s ++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }') + ifdef USE_64 + DEFINES += -DNSS_NO_INIT_SUPPORT ++ ifeq ($(PPC_ABI),2) ++ ASFILES += sha512-p8.s ++ endif + endif # USE_64 + endif # ppc + endif # Linux +-- +2.19.1 + diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild index fcd9c6e73a80..56359ce59559 100644 --- a/dev-libs/nss/nss-3.52.1-r1.ebuild +++ b/dev-libs/nss/nss-3.52.1-r1.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" + "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" ) src_prepare() { diff --git a/dev-libs/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild index df2971ed709b..d94d193dbe96 100644 --- a/dev-libs/nss/nss-3.53.1.ebuild +++ b/dev-libs/nss/nss-3.53.1.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" + "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" ) src_prepare() { |