meson.eclass: include pkg-config in the cross file
authorDavid Michael <david.michael@coreos.com>
Fri, 13 Oct 2017 19:21:01 +0000 (12:21 -0700)
committerMike Gilbert <floppym@gentoo.org>
Wed, 25 Oct 2017 02:39:22 +0000 (22:39 -0400)
This fixes cross-compiling current systemd.

Signed-off-by: David Michael <david.michael@coreos.com>
Closes: https://bugs.gentoo.org/635354
Closes: https://github.com/gentoo/gentoo/pull/5940

eclass/meson.eclass

index b339017f90178078ee23a3a14613164bc08c89c6..be1055a3fe57650ecb4f46f3b0e16d09dbc584f1 100644 (file)
@@ -125,6 +125,7 @@ _meson_create_cross_file() {
        ar = '${AR}'
        c = '${CC}'
        cpp = '${CXX}'
+       pkgconfig = '${PKG_CONFIG}'
        strip = '${STRIP}'
 
        [host_machine]
@@ -155,6 +156,7 @@ meson_src_configure() {
        local -x AR=$(tc-getAR)
        local -x CC=$(tc-getCC)
        local -x CXX=$(tc-getCXX)
+       local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
        local -x STRIP=$(tc-getSTRIP)
 
        if tc-is-cross-compiler; then
@@ -166,6 +168,7 @@ meson_src_configure() {
                AR=$(tc-getBUILD_AR)
                CC=$(tc-getBUILD_CC)
                CXX=$(tc-getBUILD_CXX)
+               PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG)
                STRIP=$(tc-getBUILD_STRIP)
        fi