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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08EB51382C5 for ; Sat, 2 Jan 2021 23:51:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F646E0802; Sat, 2 Jan 2021 23:51:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E93E5E0802 for ; Sat, 2 Jan 2021 23:51:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FFC8340CA2 for ; Sat, 2 Jan 2021 23:51:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0720DC3 for ; Sat, 2 Jan 2021 23:51:05 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1609631306.ac07a890dd55813eee120b328a17ee413e5c3489.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/systemd.eclass X-VCS-Directories: eclass/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ac07a890dd55813eee120b328a17ee413e5c3489 X-VCS-Branch: master Date: Sat, 2 Jan 2021 23:51:05 +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: b0e14aee-d5e0-4ff9-bb71-665d8ad63492 X-Archives-Hash: 44fe364da26a232e7f1fdb443ce959b9 commit: ac07a890dd55813eee120b328a17ee413e5c3489 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 2 23:37:39 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 2 23:48:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac07a890 systemd.eclass: remove SYSROOT from pkg-config output When cross-compiling, users will typically have PKG_CONFIG_SYSROOT=${SYSROOT} defined via pkg-config wrapper. When PKG_CONFIG_SYSROOT is set, all paths included in pkg-config output get prefixed with this value. Signed-off-by: Mike Gilbert gentoo.org> eclass/systemd.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 81065a0af79..f6d1fa2d92d 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -50,6 +50,7 @@ _systemd_get_dir() { if $(tc-getPKG_CONFIG) --exists systemd; then d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die + d=${d#${SYSROOT}} d=${d#${EPREFIX}} else d=${fallback}