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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Haubenwallner" <haubi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/
Date: Tue,  3 Jul 2018 13:24:11 +0000 (UTC)	[thread overview]
Message-ID: <1530624216.10631c412bbc9d66b666bf178f860a9b848d9880.haubi@gentoo> (raw)

commit:     10631c412bbc9d66b666bf178f860a9b848d9880
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 13:22:51 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 13:23:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10631c41

dev-libs/openssl: use Configure perl from PATH

With stacked-prefix, EPREFIX/usr/bin/perl may not exist.
But PATH should be fine anyway to find perl, no?
Bug: https://bugs.gentoo.org/658572
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x29FB0E9EC719EE20

 dev-libs/openssl/Manifest                 | 19 +++++++++++++++++++
 dev-libs/openssl/openssl-1.0.2n.ebuild    |  2 +-
 dev-libs/openssl/openssl-1.0.2o-r6.ebuild |  2 +-
 dev-libs/openssl/openssl-1.1.0g-r2.ebuild |  3 +--
 dev-libs/openssl/openssl-1.1.0h-r2.ebuild |  3 +--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 46a8fc4213..b123749d72 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9
 DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
 DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
@@ -15,3 +18,19 @@ DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd0613
 DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls7eKsACgkQKfsOnscZ
+7iDNCg//dj3LXeThnGum2VyJyGrciAj10QNB43ksE+7X3TOjpWU/rheLaLpj7XAN
++SNeVWBYVPKeEHYR0qDEG4lBqi8FaqM3bPQ0ZNwS7mlDL62t1FvujrhzZjBr+xfo
+Pd94GJG4bV/ll8IDDAkKKmFMV9nLU0ek1KDCXX+gR8+YAgY4S4YhCNWhHSJXYyxO
+Zi33cPKT8gf2DM1wcHkONoStsM2JZUOUUhCAnAxH39v2/ushwjeZgNNw1w6ae1pI
+IELqHlvGCYfXz1xZFWpqbyq4HzEotJIuMM2YJcfFYo/Bdoeb3Nwj8kEpnvCJ9BnA
+1a8w8E4r6SK2JLLlCGDxg82uA5QaHil829NYlFX+pV4p0F7LzOJwwo0MQCTJnKFZ
+4dLamG6bSy0c3S/Wqr57hvsrK+UF3yUVuV4rHM9BSPHzt0OW4y6mFiO3KxaU+/Le
+k9xargIz+HrQbbzU0Oj/zvYcbtbL6kRJL+nmjSOTl6QAwqn2JCKr0d2idrpain2n
+rHxlfXqB8+SjlU9FKPZ6xD1Cn4CewedjsLY8SI2UtOt9aqHnaA4JQCL9cWRX6EKW
+iHjalWFOtO/9cTMrUk47lBJdfDaaCkMyun2qnWSuF0n5za56rPzMk6QYhgsx8/NW
+wJ3nc35oc7mN6/3Q+11RJ3C7i8mJPW5CT48a4l/ybLIym/rzo6Q=
+=S5JQ
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index b797b4284c..bf7e07e097 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -98,7 +98,7 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	sed -i '1s,^:$,#!'"$(type -P perl)"',' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
 	./config --test-sanity || die "I AM NOT SANE"

diff --git a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
index e53b9ac004..abda3fe827 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
@@ -141,7 +141,7 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	sed -i '1s,^:$,#!'"$(type -P perl)"',' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
 	./config --test-sanity || die "I AM NOT SANE"

diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
index 6401834253..1d02605858 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
@@ -121,10 +121,9 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	use prefix-chain ||
 	# Prefixify Configure shebang (#141906)
 	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-e "1s,/usr/bin/env,$(type -P env)," \
 		-i Configure || die
 	# Remove test target when FEATURES=test isn't set
 	if ! use test ; then

diff --git a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
index 077eca955c..dbd701f3c0 100644
--- a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
@@ -123,10 +123,9 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	use prefix-chain ||
 	# Prefixify Configure shebang (#141906)
 	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-e "1s,/usr/bin/env,$(type -P env)," \
 		-i Configure || die
 	# Remove test target when FEATURES=test isn't set
 	if ! use test ; then

next             reply	other threads:[~2018-07-03 13:24 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03 13:24 Michael Haubenwallner [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-06-21 18:37 Fabian Groffen
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-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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:46a8fc421 dfblob:b123749d7 dfblob:b797b4284 dfblob:bf7e07e09
dfblob:e53b9ac00 dfblob:abda3fe82 dfblob:640183425 dfblob:1d0260585
dfblob:077eca955 dfblob:dbd701f3c )
 OR (
bs:"[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/" )
	(help)

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=1530624216.10631c412bbc9d66b666bf178f860a9b848d9880.haubi@gentoo \
    --to=haubi@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