Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: Apache project <apache-bugs@g.o>, James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 3/3] dev-libs/apr-util: Don't prefix db_includedir with SYSROOT
Date: Mon, 12 Dec 2022 21:51:12
Message-Id: 20221212215004.7445-3-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/3] db-use.eclass: Drop support for EAPI 5 and 6 by James Le Cuirot
1 The function will do it for you now, although with ESYSROOT rather than
2 SYSROOT, which was incorrect.
3
4 Signed-off-by: James Le Cuirot <chewi@g.o>
5 ---
6 dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 2 +-
7 dev-libs/apr-util/apr-util-1.6.1-r8.ebuild | 2 +-
8 dev-libs/apr-util/apr-util-1.6.1-r9.ebuild | 2 +-
9 3 files changed, 3 insertions(+), 3 deletions(-)
10
11 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
12 index 0e42903cdab1..198a64cbc507 100644
13 --- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
14 +++ b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
15 @@ -96,7 +96,7 @@ src_configure() {
16 # We use $T for the libdir because otherwise it'd simply be the normal
17 # system libdir. That's pointless as the compiler will search it for
18 # us already. This makes cross-compiling and such easier.
19 - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
20 + --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
21 )
22 else
23 myconf+=( --without-berkeley-db )
24 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
25 index 6209149b702b..b768137d1819 100644
26 --- a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
27 +++ b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
28 @@ -95,7 +95,7 @@ src_configure() {
29 # We use $T for the libdir because otherwise it'd simply be the normal
30 # system libdir. That's pointless as the compiler will search it for
31 # us already. This makes cross-compiling and such easier.
32 - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
33 + --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
34 )
35 else
36 myconf+=( --without-berkeley-db )
37 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
38 index facb1b2e7b80..42ff0c6607ef 100644
39 --- a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
40 +++ b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
41 @@ -96,7 +96,7 @@ src_configure() {
42 # We use $T for the libdir because otherwise it'd simply be the normal
43 # system libdir. That's pointless as the compiler will search it for
44 # us already. This makes cross-compiling and such easier.
45 - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
46 + --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
47 )
48 else
49 myconf+=( --without-berkeley-db )
50 --
51 2.38.1