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

[Mike Gilbert]

commit:     35d5e203ea11a89c95364f1e66d0673d7da9c24b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 01:18:59 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 01:18:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d5e203

dev-libs/openssl: always call Configure directly

Since 2f44c815, config has been a wrapper that simply passes its
arguments to Configure.

We can call Configure directly, using perl from PATH to avoid any
shebang issues on prefix.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-libs/openssl/openssl-3.0.7-r2.ebuild | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild 
b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
index b32f5c40c02c..e83dd0df830b 100644
--- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
@@ -148,24 +148,9 @@ src_prepare() {
 
        append-flags $(test-flags-CC -Wa,--noexecstack)
 
-       # Prefixify Configure shebang (bug #141906)
-       sed \
-               -e "1s,/usr/bin/env,${BROOT}&," \
-               -i Configure || die
-
-       # Remove test target when FEATURES=test isn't set
-       if ! use test ; then
-               sed \
-                       -e '/^$config{dirs}/s@ "test",@@' \
-                       -i Configure || die
-       fi
-
        local sslout=$(./gentoo.config)
        einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-       # 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 ${sslout} --test-sanity || die "I AM NOT SANE"
+       edo perl Configure ${sslout} --test-sanity
 
        multilib_copy_sources
 }
@@ -198,8 +183,6 @@ multilib_src_configure() {
 
        local sslout=$(./gentoo.config)
        einfo "Using configuration: ${sslout:-(openssl knows best)}"
-       local config="Configure"
-       [[ -z ${sslout} ]] && config="config"
 
        # 
https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
        local myeconfargs=(
@@ -232,7 +215,7 @@ multilib_src_configure() {
                threads
        )
 
-       CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+       CFLAGS= LDFLAGS= edo perl Configure "${myeconfargs[@]}"
 
        # Clean out hardcoded flags that openssl uses
        local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \