| 1 |
commit: 12c1af25e48b57a7f67979fada914a377969e848 |
| 2 |
Author: David Michael <david.michael <AT> coreos <DOT> com> |
| 3 |
AuthorDate: Fri Oct 13 19:21:01 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 25 02:39:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c1af25 |
| 7 |
|
| 8 |
meson.eclass: include pkg-config in the cross file |
| 9 |
|
| 10 |
This fixes cross-compiling current systemd. |
| 11 |
|
| 12 |
Signed-off-by: David Michael <david.michael <AT> coreos.com> |
| 13 |
Closes: https://bugs.gentoo.org/635354 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/5940 |
| 15 |
|
| 16 |
eclass/meson.eclass | 3 +++ |
| 17 |
1 file changed, 3 insertions(+) |
| 18 |
|
| 19 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 20 |
index b339017f901..be1055a3fe5 100644 |
| 21 |
--- a/eclass/meson.eclass |
| 22 |
+++ b/eclass/meson.eclass |
| 23 |
@@ -125,6 +125,7 @@ _meson_create_cross_file() { |
| 24 |
ar = '${AR}' |
| 25 |
c = '${CC}' |
| 26 |
cpp = '${CXX}' |
| 27 |
+ pkgconfig = '${PKG_CONFIG}' |
| 28 |
strip = '${STRIP}' |
| 29 |
|
| 30 |
[host_machine] |
| 31 |
@@ -155,6 +156,7 @@ meson_src_configure() { |
| 32 |
local -x AR=$(tc-getAR) |
| 33 |
local -x CC=$(tc-getCC) |
| 34 |
local -x CXX=$(tc-getCXX) |
| 35 |
+ local -x PKG_CONFIG=$(tc-getPKG_CONFIG) |
| 36 |
local -x STRIP=$(tc-getSTRIP) |
| 37 |
|
| 38 |
if tc-is-cross-compiler; then |
| 39 |
@@ -166,6 +168,7 @@ meson_src_configure() { |
| 40 |
AR=$(tc-getBUILD_AR) |
| 41 |
CC=$(tc-getBUILD_CC) |
| 42 |
CXX=$(tc-getBUILD_CXX) |
| 43 |
+ PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG) |
| 44 |
STRIP=$(tc-getBUILD_STRIP) |
| 45 |
fi |
Archives