From: James Le Cuirot <chewi@gentoo.org>
To: gentoo-dev <gentoo-dev@lists.gentoo.org>
Cc: Apache project <apache-bugs@gentoo.org>,
James Le Cuirot <chewi@gentoo.org>
Subject: [gentoo-dev] [PATCH 3/3] dev-libs/apr-util: Don't prefix db_includedir with SYSROOT
Date: Mon, 12 Dec 2022 21:50:04 +0000 [thread overview]
Message-ID: <20221212215004.7445-3-chewi@gentoo.org> (raw)
In-Reply-To: <20221212215004.7445-1-chewi@gentoo.org>
The function will do it for you now, although with ESYSROOT rather than
SYSROOT, which was incorrect.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 2 +-
dev-libs/apr-util/apr-util-1.6.1-r8.ebuild | 2 +-
dev-libs/apr-util/apr-util-1.6.1-r9.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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
index 0e42903cdab1..198a64cbc507 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
@@ -96,7 +96,7 @@ src_configure() {
# We use $T for the libdir because otherwise it'd simply be the normal
# system libdir. That's pointless as the compiler will search it for
# us already. This makes cross-compiling and such easier.
- --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+ --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
)
else
myconf+=( --without-berkeley-db )
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
index 6209149b702b..b768137d1819 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
@@ -95,7 +95,7 @@ src_configure() {
# We use $T for the libdir because otherwise it'd simply be the normal
# system libdir. That's pointless as the compiler will search it for
# us already. This makes cross-compiling and such easier.
- --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+ --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
)
else
myconf+=( --without-berkeley-db )
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
index facb1b2e7b80..42ff0c6607ef 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
@@ -96,7 +96,7 @@ src_configure() {
# We use $T for the libdir because otherwise it'd simply be the normal
# system libdir. That's pointless as the compiler will search it for
# us already. This makes cross-compiling and such easier.
- --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+ --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
)
else
myconf+=( --without-berkeley-db )
--
2.38.1
prev parent reply other threads:[~2022-12-12 21:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 21:50 [gentoo-dev] [PATCH 1/3] db-use.eclass: Drop support for EAPI 5 and 6 James Le Cuirot
2022-12-12 21:50 ` [gentoo-dev] [PATCH 2/3] db-use.eclass: Use ESYSROOT rather than EPREFIX where appropriate James Le Cuirot
2022-12-12 21:50 ` James Le Cuirot [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221212215004.7445-3-chewi@gentoo.org \
--to=chewi@gentoo.org \
--cc=apache-bugs@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox