Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/
Date: Sat, 14 May 2022 00:47:32
Message-Id: 1652489217.122b1a011834c7637869a1479e61ebb93a028a85.sam@gentoo
1 commit: 122b1a011834c7637869a1479e61ebb93a028a85
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 19 15:31:45 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 00:46:57 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122b1a01
7
8 net-libs/serf: [QA] inline ESYSROOT
9
10 ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-libs/serf/serf-1.3.9-r2.ebuild | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17 diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
18 index 873b3807ea7d..5ad2ec1a1adc 100644
19 --- a/net-libs/serf/serf-1.3.9-r2.ebuild
20 +++ b/net-libs/serf/serf-1.3.9-r2.ebuild
21 @@ -52,8 +52,8 @@ src_compile() {
22 # These config scripts are sent through a shell with an empty env
23 # which breaks the SYSROOT usage in them. Set the vars inline to
24 # avoid that.
25 - APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
26 - APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
27 + APR="SYSROOT='${SYSROOT}' ${ESYSROOT}/usr/bin/apr-1-config"
28 + APU="SYSROOT='${SYSROOT}' ${ESYSROOT}/usr/bin/apu-1-config"
29 AR="$(tc-getAR)"
30 RANLIB="$(tc-getRANLIB)"
31 CC="$(tc-getCC)"
32 @@ -63,7 +63,7 @@ src_compile() {
33 )
34
35 if use kerberos; then
36 - myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
37 + myesconsargs+=( GSSAPI="${ESYSROOT}/usr/bin/krb5-config" )
38 fi
39
40 escons "${myesconsargs[@]}"