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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7998115800F for ; Sun, 15 Jan 2023 01:35:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEBDAE07DB; Sun, 15 Jan 2023 01:35:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95913E07DB for ; Sun, 15 Jan 2023 01:35:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52D15335D64 for ; Sun, 15 Jan 2023 01:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86E8F7FF for ; Sun, 15 Jan 2023 01:35:49 +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: <1673745539.35d5e203ea11a89c95364f1e66d0673d7da9c24b.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-3.0.7-r2.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 35d5e203ea11a89c95364f1e66d0673d7da9c24b X-VCS-Branch: master Date: Sun, 15 Jan 2023 01:35:49 +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: 6937bc64-3b2a-4cc9-849f-ca58a0962f76 X-Archives-Hash: 3e48fc9db09d03cd4cd1b80e43348d0e commit: 35d5e203ea11a89c95364f1e66d0673d7da9c24b Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 15 01:18:59 2023 +0000 Commit: Mike Gilbert gentoo 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 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 \