Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/
Date: Sat, 29 Jan 2022 06:29:20
Message-Id: 1643437746.ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31.sam@gentoo
1 commit: ffb41addabf2ff4d8cfd6c7cd1696d3b5c356d31
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Fri Jan 28 10:55:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 06:29:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb41add
7
8 dev-libs/skalibs: respect user provided flags
9
10 The patch is taken from upstream for 2.11.1.0 and backported to 2.9.3.0.
11
12 See-also: http://skarnet.org/lists/skaware/1656.html
13 Closes: https://bugs.gentoo.org/747595
14 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
15 Closes: https://github.com/gentoo/gentoo/pull/23995
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 ...libs-2.11.1.0-respect-user-provided-flags.patch | 33 ++++++++++++++++++++++
19 ...alibs-2.9.3.0-respect-user-provided-flags.patch | 33 ++++++++++++++++++++++
20 dev-libs/skalibs/skalibs-2.11.1.0.ebuild | 2 ++
21 dev-libs/skalibs/skalibs-2.9.3.0.ebuild | 2 ++
22 4 files changed, 70 insertions(+)
23
24 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
25 new file mode 100644
26 index 000000000000..3092d86f3f6e
27 --- /dev/null
28 +++ b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
29 @@ -0,0 +1,33 @@
30 +From: Laurent Bercot <ska-skaware@×××××××.org>
31 +Date: Mon, 24 Jan 2022 11:44:29 +0000
32 +Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
33 + autodetection
34 +
35 +Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
36 +See-also: http://skarnet.org/lists/skaware/1656.html
37 +---
38 +diff --git a/configure b/configure
39 +index 1aa8fc7..430e57e 100755
40 +--- a/configure
41 ++++ b/configure
42 +@@ -99,7 +99,7 @@ stripdir () {
43 + tryflag () {
44 + echo "Checking whether compiler accepts $2 ..."
45 + echo "typedef int x;" > "$tmpc"
46 +- if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
47 ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
48 + echo " ... yes"
49 + eval "$1=\"\${$1} \$2\""
50 + eval "$1=\${$1# }"
51 +@@ -113,7 +113,7 @@ tryflag () {
52 + tryldflag () {
53 + echo "Checking whether linker accepts $2 ..."
54 + echo "typedef int x;" > "$tmpc"
55 +- if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
56 ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
57 + echo " ... yes"
58 + eval "$1=\"\${$1} \$2\""
59 + eval "$1=\${$1# }"
60 +--
61 +2.34.1
62 +
63
64 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
65 new file mode 100644
66 index 000000000000..a36db4853a15
67 --- /dev/null
68 +++ b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
69 @@ -0,0 +1,33 @@
70 +From: Laurent Bercot <ska-skaware@×××××××.org>
71 +Date: Mon, 24 Jan 2022 11:44:29 +0000
72 +Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
73 + autodetection
74 +
75 +Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
76 +See-also: http://skarnet.org/lists/skaware/1656.html
77 +---
78 +diff --git a/configure b/configure
79 +index 55f34f8..49b3678 100755
80 +--- a/configure
81 ++++ b/configure
82 +@@ -99,7 +99,7 @@ stripdir () {
83 + tryflag () {
84 + echo "Checking whether compiler accepts $2 ..."
85 + echo "typedef int x;" > "$tmpc"
86 +- if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
87 ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
88 + echo " ... yes"
89 + eval "$1=\"\${$1} \$2\""
90 + eval "$1=\${$1# }"
91 +@@ -113,7 +113,7 @@ tryflag () {
92 + tryldflag () {
93 + echo "Checking whether linker accepts $2 ..."
94 + echo "typedef int x;" > "$tmpc"
95 +- if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
96 ++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
97 + echo " ... yes"
98 + eval "$1=\"\${$1} \$2\""
99 + eval "$1=\${$1# }"
100 +--
101 +2.34.1
102 +
103
104 diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
105 index 37232ee4d776..69fb41fd5e6c 100644
106 --- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
107 +++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
108 @@ -16,6 +16,8 @@ IUSE="doc ipv6 static-libs"
109
110 HTML_DOCS=( doc/. )
111
112 +PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
113 +
114 src_prepare() {
115 default
116
117
118 diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
119 index f0f4d42d722a..fb9bc2eb668a 100644
120 --- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
121 +++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
122 @@ -16,6 +16,8 @@ IUSE="doc ipv6 static-libs"
123
124 HTML_DOCS=( doc/. )
125
126 +PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
127 +
128 src_prepare() {
129 default
Report Message
Find on MARC Find on Google Groups