* [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/
@ 2022-01-29 6:29 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-01-29 6:29 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/
@ 2022-06-13 14:56 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2022-06-13 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 1a498531ad0b5b9ab0a36645d30668db6a6adf27
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jun 12 20:07:21 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 14:55:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a498531
dev-libs/skalibs: drop 2.11.1.0
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25869
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/skalibs/Manifest | 1 -
...libs-2.11.1.0-respect-user-provided-flags.patch | 33 ----------------
dev-libs/skalibs/skalibs-2.11.1.0.ebuild | 45 ----------------------
3 files changed, 79 deletions(-)
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index a3b0d6e1232e..83dba18533cf 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,2 +1 @@
-DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
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
deleted file mode 100644
index 3092d86f3f6e..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
deleted file mode 100644
index c2ffd2478c25..000000000000
--- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc ipv6 static-libs"
-
-HTML_DOCS=( doc/. )
-
-PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --datadir=/etc
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --sysdepdir=/usr/$(get_libdir)/${PN}
- --enable-clock
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable ipv6)
- )
-
- econf "${myconf[@]}"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-13 14:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-29 6:29 [gentoo-commits] repo/gentoo:master commit in: dev-libs/skalibs/files/, dev-libs/skalibs/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-13 14:56 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox