diff options
Diffstat (limited to 'dev-libs/openssl/openssl-1.1.1s-r1.ebuild')
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.1s-r1.ebuild | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild index e2f32f1b8861..910d8fcfbda4 100644 --- a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild @@ -132,11 +132,6 @@ 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 \ @@ -160,12 +155,12 @@ src_prepare() { local sslout=$(./gentoo.config) einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" + local config="perl Configure" + [[ -z ${sslout} ]] && config="sh config -v" # 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 - edo ./${config} ${sslout} --test-sanity || die "I AM NOT SANE" + edo ${config} ${sslout} --test-sanity multilib_copy_sources } @@ -198,8 +193,8 @@ multilib_src_configure() { local sslout=$(./gentoo.config) einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" + local config="perl Configure" + [[ -z ${sslout} ]] && config="sh config -v" # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. @@ -237,7 +232,7 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + CFLAGS= LDFLAGS= edo ${config} "${myeconfargs[@]}" # Clean out hardcoded flags that openssl uses local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ |