[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/

[Michael Haubenwallner]

commit:     2cc68faf61f24aaa4350875ca9647a42db54e5af
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 07:48:49 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 07:49:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2cc68faf

dev-libs/openssl: preserve non-static .dll.a libs

Package-Manager: Portage-2.3.10-prefix, Repoman-2.3.3

 dev-libs/openssl/openssl-1.0.2l.ebuild | 2 +-
 dev-libs/openssl/openssl-1.1.0f.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild 
b/dev-libs/openssl/openssl-1.0.2l.ebuild
index 78e448cb50..2022ae6658 100644
--- a/dev-libs/openssl/openssl-1.0.2l.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2l.ebuild
@@ -225,7 +225,7 @@ multilib_src_install_all() {
        # Only way around this would be to manually configure+compile openssl
        # twice; once with shared lib support enabled and once without.
        use static-libs || find "${ED}"usr/lib* -mindepth 1 -maxdepth 1 \
-               -name "lib*.a" -not -name "lib*$(get_libname)" -delete
+               -name "lib*.a" -not -name "*.dll.a" -not -name 
"*$(get_libname)" -delete
 
        # create the certs directory
        dodir ${SSL_CNF_DIR}/certs

diff --git a/dev-libs/openssl/openssl-1.1.0f.ebuild 
b/dev-libs/openssl/openssl-1.1.0f.ebuild
index 38100de289..2ae77799e5 100644
--- a/dev-libs/openssl/openssl-1.1.0f.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0f.ebuild
@@ -203,7 +203,7 @@ multilib_src_install_all() {
        # Only way around this would be to manually configure+compile openssl
        # twice; once with shared lib support enabled and once without.
        use static-libs || find "${ED}"usr/lib* -mindepth 1 -maxdepth 1 \
-               -name "lib*.a" -not -name "lib*$(get_libname)" -delete
+               -name "lib*.a" -not -name "*.dll.a" -not -name 
"*$(get_libname)" -delete
 
        # create the certs directory
        keepdir ${SSL_CNF_DIR}/certs