| 1 |
commit: c9a008ca43d6270d14c6b4b9bcb2cc444ff74b5b |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Feb 1 03:00:00 2022 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 1 18:10:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a008ca |
| 7 |
|
| 8 |
net-libs/serf: Disable static libraries unconditionally |
| 9 |
|
| 10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 12 |
|
| 13 |
net-libs/serf/serf-1.3.9-r2.ebuild | 10 ++++++---- |
| 14 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild |
| 17 |
index 97f33256c398..873b3807ea7d 100644 |
| 18 |
--- a/net-libs/serf/serf-1.3.9-r2.ebuild |
| 19 |
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild |
| 20 |
@@ -14,7 +14,8 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" |
| 21 |
LICENSE="Apache-2.0" |
| 22 |
SLOT="1" |
| 23 |
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" |
| 24 |
-IUSE="kerberos static-libs" |
| 25 |
+IUSE="kerberos" |
| 26 |
+# Many test failures. |
| 27 |
RESTRICT="test" |
| 28 |
|
| 29 |
RDEPEND="dev-libs/apr:1= |
| 30 |
@@ -25,7 +26,8 @@ RDEPEND="dev-libs/apr:1= |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
>=dev-util/scons-2.3.0" |
| 33 |
|
| 34 |
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch |
| 35 |
+PATCHES=( |
| 36 |
+ "${FILESDIR}"/${PN}-1.3.8-static-lib.patch |
| 37 |
"${FILESDIR}"/${PN}-1.3.8-openssl.patch |
| 38 |
"${FILESDIR}"/${PN}-1.3.9-python3.patch |
| 39 |
"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch |
| 40 |
@@ -36,7 +38,7 @@ src_prepare() { |
| 41 |
default |
| 42 |
|
| 43 |
# https://code.google.com/p/serf/issues/detail?id=133 |
| 44 |
- sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct |
| 45 |
+ sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die |
| 46 |
|
| 47 |
# need limits.h for PATH_MAX (only when EXTENSIONS is enabled) |
| 48 |
[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ |
| 49 |
@@ -44,6 +46,7 @@ src_prepare() { |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
myesconsargs=( |
| 53 |
+ BUILD_STATIC=no |
| 54 |
PREFIX="${EPREFIX}/usr" |
| 55 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
| 56 |
# These config scripts are sent through a shell with an empty env |
| 57 |
@@ -51,7 +54,6 @@ src_compile() { |
| 58 |
# avoid that. |
| 59 |
APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" |
| 60 |
APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" |
| 61 |
- BUILD_STATIC=$(usex static-libs) |
| 62 |
AR="$(tc-getAR)" |
| 63 |
RANLIB="$(tc-getRANLIB)" |
| 64 |
CC="$(tc-getCC)" |
Archives