Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 19 Sep 2021 21:38:46
Message-Id: 1632087503.b6a14ebec15b54b109f93b9d330d2083a663aa1c.floppym@gentoo
1 commit: b6a14ebec15b54b109f93b9d330d2083a663aa1c
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 14:09:34 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 21:38:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a14ebe
7
8 systemd.eclass: set PKG_CONFIG_FDO_SYSROOT_RULES
9
10 This prevents pkgconf from prepending install paths with SYSROOT.
11
12 Bug: https://bugs.gentoo.org/813639
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 eclass/systemd.eclass | 3 +++
16 1 file changed, 3 insertions(+)
17
18 diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
19 index 27e4dcae1ff..c80c4c43f31 100644
20 --- a/eclass/systemd.eclass
21 +++ b/eclass/systemd.eclass
22 @@ -48,6 +48,9 @@ _systemd_get_dir() {
23 [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <variable-name> <fallback-directory>"
24 local variable=${1} fallback=${2} d
25
26 + # https://github.com/pkgconf/pkgconf/issues/205
27 + local -x PKG_CONFIG_FDO_SYSROOT_RULES=1
28 +
29 if $(tc-getPKG_CONFIG) --exists systemd; then
30 d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die
31 d=${d#${EPREFIX}}