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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D02F4138334 for ; Fri, 23 Aug 2019 18:10:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BFB8E077C; Fri, 23 Aug 2019 18:10:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B883FE077C for ; Fri, 23 Aug 2019 18:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 540DB34A21E for ; Fri, 23 Aug 2019 18:10:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26AE3771 for ; Fri, 23 Aug 2019 18:10:47 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1566583820.975f55449d9ecbac24beb97081273946083168b4.whissi@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.0.2s-r1.ebuild dev-libs/openssl/openssl-1.0.2s-r200.ebuild dev-libs/openssl/openssl-1.1.0k-r1.ebuild dev-libs/openssl/openssl-1.1.1c-r1.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 975f55449d9ecbac24beb97081273946083168b4 X-VCS-Branch: master Date: Fri, 23 Aug 2019 18:10:47 +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: 036ae3bf-35a7-4ab1-aaa0-9f9551d87b8e X-Archives-Hash: 92b462606b0b2404e14a526c95cd1046 commit: 975f55449d9ecbac24beb97081273946083168b4 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 23 17:44:30 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 23 18:10:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=975f5544 dev-libs/openssl: don't destroy user flags Thanks-to: Arfrever Frehtes Taifersar Arahesis Apache.Org> Closes: https://bugs.gentoo.org/671016 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/openssl/openssl-1.0.2s-r1.ebuild | 26 +++++++++++++++++--------- dev-libs/openssl/openssl-1.0.2s-r200.ebuild | 26 +++++++++++++++++--------- dev-libs/openssl/openssl-1.1.0k-r1.ebuild | 22 ++++++++++++++-------- dev-libs/openssl/openssl-1.1.1c-r1.ebuild | 22 ++++++++++++++-------- 4 files changed, 62 insertions(+), 34 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild index a2cb9f7917e..b4902db7e53 100644 --- a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild +++ b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild @@ -187,7 +187,9 @@ multilib_src_configure() { [[ -z ${sslout} ]] && config="config" # Fedora hobbled-EC needs 'no-ec2m', 'no-srp' - echoit \ + # Make sure user flags don't get added *yet* to avoid duplicated + # flags. + CFLAGS= LDFLAGS= echoit \ ./${config} \ ${sslout} \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ @@ -216,17 +218,23 @@ multilib_src_configure() { || die # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ + -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 "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + -e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ Makefile || die } diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild index 281b169b64b..24f2b3a5663 100644 --- a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild +++ b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild @@ -191,7 +191,9 @@ multilib_src_configure() { [[ -z ${sslout} ]] && config="config" # Fedora hobbled-EC needs 'no-ec2m', 'no-srp' - echoit \ + # Make sure user flags don't get added *yet* to avoid duplicated + # flags. + CFLAGS= LDFLAGS= echoit \ ./${config} \ ${sslout} \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ @@ -220,17 +222,23 @@ multilib_src_configure() { || die # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ + -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 "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + -e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ Makefile || die } diff --git a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild index 937d3b7ed11..7bcd5d03e7e 100644 --- a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild @@ -176,7 +176,9 @@ multilib_src_configure() { # 'srp' was restricted until early 2017 as well. # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. - echoit \ + # Make sure user flags don't get added *yet* to avoid duplicated + # flags. + CFLAGS= LDFLAGS= echoit \ ./${config} \ ${sslout} \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ @@ -203,16 +205,20 @@ multilib_src_configure() { || die # Clean out hardcoded flags that openssl uses - # Fix quoting for sed local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ -e 's:^CFLAGS=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - -e 's:\\:\\\\:g' \ + -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}|" \ diff --git a/dev-libs/openssl/openssl-1.1.1c-r1.ebuild b/dev-libs/openssl/openssl-1.1.1c-r1.ebuild index 683c5707566..a3a0f2a2c06 100644 --- a/dev-libs/openssl/openssl-1.1.1c-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.1c-r1.ebuild @@ -172,7 +172,9 @@ multilib_src_configure() { # 'srp' was restricted until early 2017 as well. # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. - echoit \ + # Make sure user flags don't get added *yet* to avoid duplicated + # flags. + CFLAGS= LDFLAGS= echoit \ ./${config} \ ${sslout} \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ @@ -199,16 +201,20 @@ multilib_src_configure() { || die # Clean out hardcoded flags that openssl uses - # Fix quoting for sed local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ -e 's:^CFLAGS=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - -e 's:\\:\\\\:g' \ + -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}|" \