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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A972915800F for ; Sat, 4 Feb 2023 03:25:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B09EEE07B3; Sat, 4 Feb 2023 03:25:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 9005FE07B3 for ; Sat, 4 Feb 2023 03:25:01 +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 3FC21340DAE for ; Sat, 4 Feb 2023 03:25:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8626F89B for ; Sat, 4 Feb 2023 03:24:58 +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: <1675480433.bf435595a9b979a91898c1d86958cb776a31b192.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-r4.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bf435595a9b979a91898c1d86958cb776a31b192 X-VCS-Branch: master Date: Sat, 4 Feb 2023 03:24:58 +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: 46302b50-7ef3-4575-a1b0-f47243cf8560 X-Archives-Hash: 4fa816fc8e05313268ff18f0c820a973 commit: bf435595a9b979a91898c1d86958cb776a31b192 Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 4 02:53:24 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 4 03:13:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf435595 dev-libs/openssl: drop Makefile CFLAGS hackery >From what I can tell, the current build system respects CFLAGS without any intervention. Signed-off-by: Mike Gilbert gentoo.org> dev-libs/openssl/openssl-3.0.7-r4.ebuild | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dev-libs/openssl/openssl-3.0.7-r4.ebuild b/dev-libs/openssl/openssl-3.0.7-r4.ebuild index 6921c7f98501..0fd8cec1764e 100644 --- a/dev-libs/openssl/openssl-3.0.7-r4.ebuild +++ b/dev-libs/openssl/openssl-3.0.7-r4.ebuild @@ -201,28 +201,7 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo perl Configure "${myeconfargs[@]}" - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile \ - || die + edo perl Configure "${myeconfargs[@]}" } multilib_src_compile() {