From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 BC532158020 for ; Sun, 18 Dec 2022 14:00:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0518E0894; Sun, 18 Dec 2022 14:00:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AC69E0894 for ; Sun, 18 Dec 2022 14:00:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01CF3340DFB for ; Sun, 18 Dec 2022 14:00:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66FA67C6 for ; Sun, 18 Dec 2022 14:00:42 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1671371975.7e1ec2394d628ece7afe8fb05854365c84d8ac9e.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr-util/apr-util-1.6.1-r10.ebuild dev-libs/apr-util/apr-util-1.6.1-r9.ebuild X-VCS-Directories: dev-libs/apr-util/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 7e1ec2394d628ece7afe8fb05854365c84d8ac9e X-VCS-Branch: master Date: Sun, 18 Dec 2022 14:00:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3eb68eb3-ad83-431b-bbce-9285ea9adc53 X-Archives-Hash: b96560b9024de9388cbaba549d4b3be5 commit: 7e1ec2394d628ece7afe8fb05854365c84d8ac9e Author: James Le Cuirot gentoo org> AuthorDate: Mon Dec 12 21:43:47 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 18 13:59:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1ec239 dev-libs/apr-util: Don't prefix db_includedir with SYSROOT The function will do it for you now, although with ESYSROOT rather than SYSROOT, which was incorrect. Signed-off-by: James Le Cuirot gentoo.org> dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 2 +- dev-libs/apr-util/apr-util-1.6.1-r9.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 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 34e92f237803..ff0412e3d5fc 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-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 )