| 1 |
commit: 85e0c20c96c6260e927eef41fe0aae42fcf11cb6 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 28 09:41:03 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 28 09:41:03 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e0c20c |
| 7 |
|
| 8 |
sys-libs/libcap: Don't remove libpsx.a or -lpsx fails for consumers |
| 9 |
|
| 10 |
Attempt to fix build with LTO |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/702516 |
| 13 |
Closes: https://bugs.gentoo.org/703912 |
| 14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 15 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 16 |
|
| 17 |
.../libcap/files/libcap-2.29-build-system-fixes.patch | 17 +++++++++++++++-- |
| 18 |
.../{libcap-2.29.ebuild => libcap-2.29-r1.ebuild} | 4 +++- |
| 19 |
2 files changed, 18 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch |
| 22 |
index 910163c2612..a7751f429fd 100644 |
| 23 |
--- a/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch |
| 24 |
+++ b/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-From 449b6cb6226086c136dd108d11471d99692812b7 Mon Sep 17 00:00:00 2001 |
| 27 |
+From 907626b63794199163778761fb56a5c89aa33e35 Mon Sep 17 00:00:00 2001 |
| 28 |
From: Mike Frysinger <vapier@g.o> |
| 29 |
Date: Wed, 10 Feb 2016 09:47:27 +0100 |
| 30 |
Subject: [PATCH] build system fixes |
| 31 |
@@ -21,11 +21,12 @@ Forward ported from libcap-2.28 to libcap-2.29 |
| 32 |
Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 33 |
--- |
| 34 |
Make.Rules | 27 +++++++++++++++------------ |
| 35 |
+ Makefile | 1 - |
| 36 |
libcap/Makefile | 7 ++++--- |
| 37 |
pam_cap/Makefile | 8 +++++--- |
| 38 |
progs/Makefile | 2 +- |
| 39 |
tests/Makefile | 8 +++++--- |
| 40 |
- 5 files changed, 30 insertions(+), 22 deletions(-) |
| 41 |
+ 6 files changed, 30 insertions(+), 23 deletions(-) |
| 42 |
|
| 43 |
diff --git a/Make.Rules b/Make.Rules |
| 44 |
index e7641e7..32c57df 100644 |
| 45 |
@@ -82,6 +83,18 @@ index e7641e7..32c57df 100644 |
| 46 |
ifeq ($(GOLANG),yes) |
| 47 |
GOROOT := $(shell go env GOROOT) |
| 48 |
GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) |
| 49 |
+diff --git a/Makefile b/Makefile |
| 50 |
+index 14e29ef..f0104e0 100644 |
| 51 |
+--- a/Makefile |
| 52 |
++++ b/Makefile |
| 53 |
+@@ -16,7 +16,6 @@ endif |
| 54 |
+ ifeq ($(GOLANG),yes) |
| 55 |
+ $(MAKE) -C go $@ |
| 56 |
+ endif |
| 57 |
+- $(MAKE) -C tests $@ |
| 58 |
+ $(MAKE) -C progs $@ |
| 59 |
+ $(MAKE) -C doc $@ |
| 60 |
+ $(MAKE) -C kdebug $@ |
| 61 |
diff --git a/libcap/Makefile b/libcap/Makefile |
| 62 |
index 949cfad..a7f80ce 100644 |
| 63 |
--- a/libcap/Makefile |
| 64 |
|
| 65 |
diff --git a/sys-libs/libcap/libcap-2.29.ebuild b/sys-libs/libcap/libcap-2.29-r1.ebuild |
| 66 |
similarity index 94% |
| 67 |
rename from sys-libs/libcap/libcap-2.29.ebuild |
| 68 |
rename to sys-libs/libcap/libcap-2.29-r1.ebuild |
| 69 |
index 567940f4c71..baec266531e 100644 |
| 70 |
--- a/sys-libs/libcap/libcap-2.29.ebuild |
| 71 |
+++ b/sys-libs/libcap/libcap-2.29-r1.ebuild |
| 72 |
@@ -64,7 +64,9 @@ multilib_src_install() { |
| 73 |
|
| 74 |
gen_usr_ldscript -a cap |
| 75 |
if ! use static-libs ; then |
| 76 |
- rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die |
| 77 |
+ # Don't remove libpsx.a! |
| 78 |
+ # See https://bugs.gentoo.org/703912 |
| 79 |
+ rm "${ED}"/usr/$(get_libdir)/libcap.a || die |
| 80 |
fi |
| 81 |
|
| 82 |
if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then |
Archives