| 1 |
commit: ac07a890dd55813eee120b328a17ee413e5c3489 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 2 23:37:39 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 23:48:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac07a890 |
| 7 |
|
| 8 |
systemd.eclass: remove SYSROOT from pkg-config output |
| 9 |
|
| 10 |
When cross-compiling, users will typically have |
| 11 |
PKG_CONFIG_SYSROOT=${SYSROOT} defined via pkg-config wrapper. |
| 12 |
|
| 13 |
When PKG_CONFIG_SYSROOT is set, all paths included in pkg-config |
| 14 |
output get prefixed with this value. |
| 15 |
|
| 16 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/systemd.eclass | 1 + |
| 19 |
1 file changed, 1 insertion(+) |
| 20 |
|
| 21 |
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass |
| 22 |
index 81065a0af79..f6d1fa2d92d 100644 |
| 23 |
--- a/eclass/systemd.eclass |
| 24 |
+++ b/eclass/systemd.eclass |
| 25 |
@@ -50,6 +50,7 @@ _systemd_get_dir() { |
| 26 |
|
| 27 |
if $(tc-getPKG_CONFIG) --exists systemd; then |
| 28 |
d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die |
| 29 |
+ d=${d#${SYSROOT}} |
| 30 |
d=${d#${EPREFIX}} |
| 31 |
else |
| 32 |
d=${fallback} |
Archives