From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-98735-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C62CC158020
for <garchives@archives.gentoo.org>; Mon, 12 Dec 2022 21:51:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 59C70E08C8;
Mon, 12 Dec 2022 21:50:35 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 22622E08BB
for <gentoo-dev@lists.gentoo.org>; Mon, 12 Dec 2022 21:50:35 +0000 (UTC)
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
Message-Id: <20221212215004.7445-3-chewi@gentoo.org>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221212215004.7445-1-chewi@gentoo.org>
References: <20221212215004.7445-1-chewi@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Archives-Salt: a5b97b19-097c-4bcb-aacb-9febf1b54b78
X-Archives-Hash: b57083aa9fa7d03178adbaacf8d7fed7
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