[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     12c1af25e48b57a7f67979fada914a377969e848
Author:     David Michael <david.michael <AT> coreos <DOT> com>
AuthorDate: Fri Oct 13 19:21:01 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 02:39:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c1af25

meson.eclass: include pkg-config in the cross file

This fixes cross-compiling current systemd.

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

 eclass/meson.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index b339017f901..be1055a3fe5 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -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