[gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/
Date: Sat, 29 Jan 2022 06:29:16 +0000 (UTC)	[thread overview]
Message-ID: <1643437746.ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31.sam@gentoo> (raw)

commit:     ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri Jan 28 10:55:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/23995
Signed-off-by: Sam James <sam <AT> 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 <ska-skaware@skarnet.org>
+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 <ska-skaware@skarnet.org>
+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

next             reply	other threads:[~2022-01-29  6:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-29  6:29 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-13 14:56 [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/ Joonas Niilola

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3092d86f3f6 dfblob:a36db4853a1 dfblob:37232ee4d77
dfblob:69fb41fd5e6 dfblob:f0f4d42d722 dfblob:fb9bc2eb668 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1643437746.ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox