diff options
author | 2020-09-25 22:17:58 -0500 | |
---|---|---|
committer | 2020-09-25 22:17:58 -0500 | |
commit | 89cb0340b80c3df1927bbac0bcb99ac793c51cae (patch) | |
tree | 38c38a00b3f5eb7a9b6fff377aae329167b558e4 | |
parent | www-client/firefox: Version bump 81.0b9 (diff) | |
download | anarchy-89cb0340b80c3df1927bbac0bcb99ac793c51cae.tar.gz anarchy-89cb0340b80c3df1927bbac0bcb99ac793c51cae.tar.bz2 anarchy-89cb0340b80c3df1927bbac0bcb99ac793c51cae.zip |
dev-libs/nss: Version bump 3.57
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r-- | dev-libs/nss/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch | 39 | ||||
-rw-r--r-- | dev-libs/nss/nss-3.57.ebuild (renamed from dev-libs/nss/nss-3.53.1.ebuild) | 13 |
3 files changed, 51 insertions, 3 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 27ff8be..3f1f003 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,2 +1,2 @@ -DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0 +DIST nss-3.57.tar.gz 81712830 BLAKE2B 998160fe16e13d1997f3d11a054148349b068214afb3c0cd3b9e82ce03999e46ca34b02907dc27e3f253653f6e57a9f1498e6c16f8665350c629f5c3c98ea0bc SHA512 7e312d7539a26f57b968548935a7715cfa895aa61da21d0542ae45b71cb16f63167728534cdfd15f8eca68c75753a0df3d05e87b4c5acaabbda63c736e552ea2 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 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 0000000..962b9cb --- /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 a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 +From: Lauri Kasanen <cand@gmx.com> +Date: Mon, 1 Jun 2020 12:11:45 +0300 +Subject: [PATCH v3] 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..e0461c7d3 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 + ifdef USE_64 + DEFINES += -DNSS_NO_INIT_SUPPORT ++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') ++ 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.53.1.ebuild b/dev-libs/nss/nss-3.57.ebuild index df2971e..c5e3dea 100644 --- a/dev-libs/nss/nss-3.53.1.ebuild +++ b/dev-libs/nss/nss-3.57.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal -NSPR_VER="4.25" +NSPR_VER="4.28" RTM_NAME="NSS_${PV//./_}_RTM" DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" @@ -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() { @@ -160,6 +161,14 @@ multilib_src_compile() { export USE_SYSTEM_ZLIB=1 export ZLIB_LIBS=-lz export ASFLAGS="" + # Fix build failure on arm64 + export NS_USE_GCC=1 + # Detect compiler type and set proper environment value + if tc-is-gcc; then + export CC_IS_GCC=1 + elif tc-is-clang; then + export CC_IS_CLANG=1 + fi local d @@ -177,7 +186,7 @@ multilib_src_compile() { CPPFLAGS="${myCPPFLAGS}" \ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ NSPR_LIB_DIR="${T}/fakedir" \ - emake -j1 "${makeargs[@]}" -C ${d} + emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)" done } |