| 1 |
commit: 99f0a2cdbd595af380bcbedf82483462ea5ce2e7 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 21 18:36:37 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 21 18:36:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99f0a2cd |
| 7 |
|
| 8 |
dev-libs/openssl-1.1.1k: minimise diffs with gx86 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/openssl/openssl-1.1.1k.ebuild | 18 ++++++++++-------- |
| 14 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild |
| 17 |
index 49ce2a7da9..ce544b470d 100644 |
| 18 |
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild |
| 19 |
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI="7" |
| 23 |
|
| 24 |
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal |
| 25 |
+inherit flag-o-matic toolchain-funcs multilib-minimal |
| 26 |
|
| 27 |
MY_P=${P/_/-} |
| 28 |
|
| 29 |
@@ -283,6 +283,15 @@ multilib_src_install() { |
| 30 |
fi |
| 31 |
|
| 32 |
emake DESTDIR="${D}" install |
| 33 |
+ |
| 34 |
+ # This is crappy in that the static archives are still built even |
| 35 |
+ # when USE=static-libs. But this is due to a failing in the openssl |
| 36 |
+ # build system: the static archives are built as PIC all the time. |
| 37 |
+ # Only way around this would be to manually configure+compile openssl |
| 38 |
+ # twice; once with shared lib support enabled and once without. |
| 39 |
+ if ! use static-libs; then |
| 40 |
+ rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die |
| 41 |
+ fi |
| 42 |
} |
| 43 |
|
| 44 |
multilib_src_install_all() { |
| 45 |
@@ -292,13 +301,6 @@ multilib_src_install_all() { |
| 46 |
|
| 47 |
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el |
| 48 |
|
| 49 |
- # This is crappy in that the static archives are still built even |
| 50 |
- # when USE=static-libs. But this is due to a failing in the openssl |
| 51 |
- # build system: the static archives are built as PIC all the time. |
| 52 |
- # Only way around this would be to manually configure+compile openssl |
| 53 |
- # twice; once with shared lib support enabled and once without. |
| 54 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
| 55 |
- |
| 56 |
# create the certs directory |
| 57 |
keepdir ${SSL_CNF_DIR}/certs |
Archives