[gentoo-commits] repo/gentoo:master commit in: net-libs/serf/

[Jakov Smolić]

commit:     c9a008ca43d6270d14c6b4b9bcb2cc444ff74b5b
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Feb  1 03:00:00 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 18:10:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a008ca

net-libs/serf: Disable static libraries unconditionally

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/serf/serf-1.3.9-r2.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild 
b/net-libs/serf/serf-1.3.9-r2.ebuild
index 97f33256c398..873b3807ea7d 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -14,7 +14,8 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="kerberos static-libs"
+IUSE="kerberos"
+# Many test failures.
 RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
@@ -25,7 +26,8 @@ RDEPEND="dev-libs/apr:1=
 DEPEND="${RDEPEND}
        >=dev-util/scons-2.3.0"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
        "${FILESDIR}"/${PN}-1.3.8-openssl.patch
        "${FILESDIR}"/${PN}-1.3.9-python3.patch
        "${FILESDIR}"/${PN}-1.3.9-python3_byte.patch
@@ -36,7 +38,7 @@ src_prepare() {
        default
 
        # https://code.google.com/p/serf/issues/detail?id=133
-       sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+       sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die
 
        # need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
        [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
@@ -44,6 +46,7 @@ src_prepare() {
 
 src_compile() {
        myesconsargs=(
+               BUILD_STATIC=no
                PREFIX="${EPREFIX}/usr"
                LIBDIR="${EPREFIX}/usr/$(get_libdir)"
                # These config scripts are sent through a shell with an empty 
env
@@ -51,7 +54,6 @@ src_compile() {
                # avoid that.
                APR="SYSROOT='${SYSROOT}' 
${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
                APU="SYSROOT='${SYSROOT}' 
${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-               BUILD_STATIC=$(usex static-libs)
                AR="$(tc-getAR)"
                RANLIB="$(tc-getRANLIB)"
                CC="$(tc-getCC)"