diff options
| -rw-r--r-- | dev-libs/skalibs/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch | 33 | ||||
| -rw-r--r-- | dev-libs/skalibs/skalibs-2.11.1.0.ebuild | 45 |
3 files changed, 0 insertions, 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[@]}" -} |