| 1 |
commit: 5c5607e394bfaf88ebba5792ff2354e26c5707ee |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 29 20:59:31 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 21:02:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5607e3 |
| 7 |
|
| 8 |
dev-libs/nss: update ppc abi patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/722110 |
| 11 |
Closes: https://bugs.gentoo.org/730172 |
| 12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch | 8 ++++---- |
| 16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index be2d4802c4c..962b9cb1eed 100644 |
| 20 |
--- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch |
| 21 |
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 |
| 24 |
|
| 25 |
-From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001 |
| 26 |
+From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 |
| 27 |
From: Lauri Kasanen <cand@×××.com> |
| 28 |
Date: Mon, 1 Jun 2020 12:11:45 +0300 |
| 29 |
-Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: |
| 30 |
+Subject: [PATCH v3] 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 |
@@ -17,7 +17,7 @@ Signed-off-by: Lauri Kasanen <cand@×××.com> |
| 35 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 36 |
|
| 37 |
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile |
| 38 |
-index 5f7384429..d01587c7a 100644 |
| 39 |
+index 5f7384429..e0461c7d3 100644 |
| 40 |
--- a/lib/freebl/Makefile |
| 41 |
+++ b/lib/freebl/Makefile |
| 42 |
@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) |
| 43 |
@@ -25,9 +25,9 @@ index 5f7384429..d01587c7a 100644 |
| 44 |
ifeq ($(CPU_ARCH),ppc) |
| 45 |
EXTRA_SRCS += gcm-ppc.c |
| 46 |
- ASFILES += sha512-p8.s |
| 47 |
-+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }') |
| 48 |
ifdef USE_64 |
| 49 |
DEFINES += -DNSS_NO_INIT_SUPPORT |
| 50 |
++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') |
| 51 |
+ ifeq ($(PPC_ABI),2) |
| 52 |
+ ASFILES += sha512-p8.s |
| 53 |
+ endif |
Archives