From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 121E41382C5 for ; Mon, 7 Jun 2021 19:33:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5043EE0867; Mon, 7 Jun 2021 19:33:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AF19E0867 for ; Mon, 7 Jun 2021 19:33:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CEEE335D05 for ; Mon, 7 Jun 2021 19:33:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1A9E27E for ; Mon, 7 Jun 2021 19:33:02 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1623094273.0ee60b97e7f653fc0cb54ac03809c07ba6c092aa.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.0.2u.ebuild dev-libs/openssl/openssl-1.1.1k.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0ee60b97e7f653fc0cb54ac03809c07ba6c092aa X-VCS-Branch: master Date: Mon, 7 Jun 2021 19:33:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 94f4a254-54d5-4d12-ae4b-a9c66354412a X-Archives-Hash: 0f0126182b85a6ff8b9d5b4ccf9c6c74 commit: 0ee60b97e7f653fc0cb54ac03809c07ba6c092aa Author: Mike Gilbert gentoo org> AuthorDate: Mon Jun 7 19:31:13 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jun 7 19:31:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee60b97 dev-libs/openssl: be more careful when removing static libs Avoids removing .dll.a files necessary for linking on mingw. Closes: https://bugs.gentoo.org/792318 Signed-off-by: Mike Gilbert gentoo.org> dev-libs/openssl/openssl-1.0.2u.ebuild | 16 +++++++++------- dev-libs/openssl/openssl-1.1.1k.ebuild | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild index b7b3fba6c2e..65c29788382 100644 --- a/dev-libs/openssl/openssl-1.0.2u.ebuild +++ b/dev-libs/openssl/openssl-1.0.2u.ebuild @@ -248,6 +248,15 @@ multilib_src_install() { fi emake INSTALL_PREFIX="${D}" install + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi } multilib_src_install_all() { @@ -260,13 +269,6 @@ multilib_src_install_all() { use rfc3779 && dodoc engines/ccgost/README.gost - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - # create the certs directory dodir ${SSL_CNF_DIR}/certs cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild index 9b4eaf0e7a6..1e98af8f703 100644 --- a/dev-libs/openssl/openssl-1.1.1k.ebuild +++ b/dev-libs/openssl/openssl-1.1.1k.ebuild @@ -270,6 +270,15 @@ multilib_src_install() { fi emake DESTDIR="${D}" install + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi } multilib_src_install_all() { @@ -279,13 +288,6 @@ multilib_src_install_all() { dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - # create the certs directory keepdir ${SSL_CNF_DIR}/certs