1 |
commit: cee7d0f5f8c8fc7d4467e495f733ff80624a1ae0 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 26 16:37:04 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 26 16:37:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee7d0f5 |
7 |
|
8 |
dev-libs/hiredis: fix deletion of static libs |
9 |
|
10 |
Closes: https://bugs.gentoo.org/749396 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/18014 |
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
dev-libs/hiredis/hiredis-0.14.1.ebuild | 2 +- |
16 |
dev-libs/hiredis/hiredis-1.0.0.ebuild | 3 +-- |
17 |
2 files changed, 2 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild |
20 |
index b0bf2fbfaed..c930d36b325 100644 |
21 |
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild |
22 |
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild |
23 |
@@ -69,7 +69,7 @@ src_test() { |
24 |
src_install() { |
25 |
_build PREFIX="${ED}/usr" install |
26 |
if ! use static-libs; then |
27 |
- rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die |
28 |
+ find "${ED}" -name '*.a' -delete || die |
29 |
fi |
30 |
|
31 |
insinto /usr/$(get_libdir)/pkgconfig |
32 |
|
33 |
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild |
34 |
index d11dddc289c..e8536113a2f 100644 |
35 |
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild |
36 |
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild |
37 |
@@ -71,8 +71,7 @@ src_test() { |
38 |
src_install() { |
39 |
_build PREFIX="${ED}/usr" install |
40 |
if ! use static-libs; then |
41 |
- rm "${ED}/usr/$(get_libdir)/libhiredis.a" \ |
42 |
- "${ED}/usr/$(get_libdir)/libhiredis_ssl.a" || die |
43 |
+ find "${ED}" -name '*.a' -delete || die |
44 |
fi |
45 |
|
46 |
insinto /usr/$(get_libdir)/pkgconfig |