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 2A71B15800F for ; Sun, 15 Jan 2023 01:54:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 051C2E07EE; Sun, 15 Jan 2023 01:54:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4814E07EE for ; Sun, 15 Jan 2023 01:54:23 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FF37335C8E for ; Sun, 15 Jan 2023 01:54:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91EA27DE for ; Sun, 15 Jan 2023 01:54:21 +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: <1673747656.9c414b3f9c6e171687b801cc3daa7c6af698491c.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-1.1.1s-r1.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9c414b3f9c6e171687b801cc3daa7c6af698491c X-VCS-Branch: master Date: Sun, 15 Jan 2023 01:54:21 +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: 8124b121-272f-4166-a3e2-07d0ec6a7f32 X-Archives-Hash: a10a4d4181d7639396ce733d53168df6 commit: 9c414b3f9c6e171687b801cc3daa7c6af698491c Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 15 01:48:10 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Jan 15 01:54:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c414b3f dev-libs/openssl: tweak config/Configure for 1.1.1 branch If gentoo.config succeeds, call "perl Configure ...". This uses perl from PATH to avoid issue on prefix, and bypasses the funky config shell script. If gentoo.config fails, call "sh config -v ...". This uses sh from PATH to avoid any issues on prefix, and produces verbose output for the build log. Signed-off-by: Mike Gilbert gentoo.org> dev-libs/openssl/openssl-1.1.1s-r1.ebuild | 17 ++++++----------- 1 file 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 \