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 64E2E158087 for ; Sat, 29 Jan 2022 06:29:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2D1B2BC009; Sat, 29 Jan 2022 06:29:19 +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 27D3D2BC009 for ; Sat, 29 Jan 2022 06:29:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A97F334326F for ; Sat, 29 Jan 2022 06:29:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BBF724E for ; Sat, 29 Jan 2022 06:29:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643437746.ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch dev-libs/skalibs/skalibs-2.11.1.0.ebuild dev-libs/skalibs/skalibs-2.9.3.0.ebuild X-VCS-Directories: dev-libs/skalibs/ dev-libs/skalibs/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31 X-VCS-Branch: master Date: Sat, 29 Jan 2022 06:29:16 +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: 6fd9ffed-e800-4cd6-8d86-a5ce889c9aa9 X-Archives-Hash: e19671f9cb449125c8c9fb6fb23588a3 commit: ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31 Author: Petr Vaněk atlas cz> AuthorDate: Fri Jan 28 10:55:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 29 06:29:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb41add dev-libs/skalibs: respect user provided flags The patch is taken from upstream for 2.11.1.0 and backported to 2.9.3.0. See-also: http://skarnet.org/lists/skaware/1656.html Closes: https://bugs.gentoo.org/747595 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/23995 Signed-off-by: Sam James gentoo.org> ...libs-2.11.1.0-respect-user-provided-flags.patch | 33 ++++++++++++++++++++++ ...alibs-2.9.3.0-respect-user-provided-flags.patch | 33 ++++++++++++++++++++++ dev-libs/skalibs/skalibs-2.11.1.0.ebuild | 2 ++ dev-libs/skalibs/skalibs-2.9.3.0.ebuild | 2 ++ 4 files changed, 70 insertions(+) diff --git a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch new file mode 100644 index 000000000000..3092d86f3f6e --- /dev/null +++ b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch @@ -0,0 +1,33 @@ +From: Laurent Bercot +Date: Mon, 24 Jan 2022 11:44:29 +0000 +Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during + autodetection + +Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection") +See-also: http://skarnet.org/lists/skaware/1656.html +--- +diff --git a/configure b/configure +index 1aa8fc7..430e57e 100755 +--- a/configure ++++ b/configure +@@ -99,7 +99,7 @@ stripdir () { + tryflag () { + echo "Checking whether compiler accepts $2 ..." + echo "typedef int x;" > "$tmpc" +- if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then + echo " ... yes" + eval "$1=\"\${$1} \$2\"" + eval "$1=\${$1# }" +@@ -113,7 +113,7 @@ tryflag () { + tryldflag () { + echo "Checking whether linker accepts $2 ..." + echo "typedef int x;" > "$tmpc" +- if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then + echo " ... yes" + eval "$1=\"\${$1} \$2\"" + eval "$1=\${$1# }" +-- +2.34.1 + diff --git a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch new file mode 100644 index 000000000000..a36db4853a15 --- /dev/null +++ b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch @@ -0,0 +1,33 @@ +From: Laurent Bercot +Date: Mon, 24 Jan 2022 11:44:29 +0000 +Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during + autodetection + +Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection") +See-also: http://skarnet.org/lists/skaware/1656.html +--- +diff --git a/configure b/configure +index 55f34f8..49b3678 100755 +--- a/configure ++++ b/configure +@@ -99,7 +99,7 @@ stripdir () { + tryflag () { + echo "Checking whether compiler accepts $2 ..." + echo "typedef int x;" > "$tmpc" +- if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then + echo " ... yes" + eval "$1=\"\${$1} \$2\"" + eval "$1=\${$1# }" +@@ -113,7 +113,7 @@ tryflag () { + tryldflag () { + echo "Checking whether linker accepts $2 ..." + echo "typedef int x;" > "$tmpc" +- if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then + echo " ... yes" + eval "$1=\"\${$1} \$2\"" + eval "$1=\${$1# }" +-- +2.34.1 + diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild index 37232ee4d776..69fb41fd5e6c 100644 --- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild +++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild @@ -16,6 +16,8 @@ IUSE="doc ipv6 static-libs" HTML_DOCS=( doc/. ) +PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" ) + src_prepare() { default diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild index f0f4d42d722a..fb9bc2eb668a 100644 --- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild +++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild @@ -16,6 +16,8 @@ IUSE="doc ipv6 static-libs" HTML_DOCS=( doc/. ) +PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" ) + src_prepare() { default