public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/
Date: Mon, 21 Jun 2021 18:37:17 +0000 (UTC)	[thread overview]
Message-ID: <1624300597.99f0a2cdbd595af380bcbedf82483462ea5ce2e7.grobian@gentoo> (raw)

commit:     99f0a2cdbd595af380bcbedf82483462ea5ce2e7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 18:36:37 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 18:36:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99f0a2cd

dev-libs/openssl-1.1.1k: minimise diffs with gx86

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-libs/openssl/openssl-1.1.1k.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
index 49ce2a7da9..ce544b470d 100644
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P=${P/_/-}
 
@@ -283,6 +283,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() {
@@ -292,13 +301,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
 


             reply	other threads:[~2021-06-21 18:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-21 18:37 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-15  0:42 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/ Sam James
2021-03-26  7:54 Fabian Groffen
2021-01-06 11:58 Fabian Groffen
2020-12-26 19:16 Fabian Groffen
2020-12-08 23:24 Sam James
2020-06-07 13:10 Fabian Groffen
2019-09-17 10:47 Fabian Groffen
2019-05-14  9:15 Michael Haubenwallner
2019-02-26  9:17 Michael Haubenwallner
2019-02-15 20:10 Michael Haubenwallner
2019-02-13 16:31 Michael Haubenwallner
2018-07-03 20:03 Fabian Groffen
2018-07-03 13:24 Michael Haubenwallner
2018-06-22  8:49 Fabian Groffen
2017-10-03  7:49 Michael Haubenwallner
2016-05-09 15:57 Michael Haubenwallner
2016-03-24  7:14 Fabian Groffen
2015-11-02 19:06 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1624300597.99f0a2cdbd595af380bcbedf82483462ea5ce2e7.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox