[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH] waf-utils.eclass: Set PKGCONFIG environment var
From:       Michał Górny <mgorny () gentoo ! org>
Date:       2018-06-24 8:46:53
Message-ID: 20180624084653.20596-1-mgorny () gentoo ! org
[Download RAW message or body]

From: Zentaro Kavanagh <zentaro@chromium.org>

* WAF uses the PKGCONFIG variable, not the more common PKG_CONFIG
* Sets the PKGCONFIG variable from tc-getPKG_CONFIG

Closes: https://github.com/gentoo/gentoo/pull/8890
---
 eclass/waf-utils.eclass | 4 ++++
 1 file changed, 4 insertions(+)

(sent on behalf of pull request submitter)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 7acc97b10314..295de5867385 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -83,6 +83,10 @@ waf-utils_src_configure() {
 	[[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)")
 
 	tc-export AR CC CPP CXX RANLIB
+
+	# WAF looks for PKGCONFIG not PKG_CONFIG.
+	local -x PKGCONFIG=$(tc-getPKG_CONFIG)
+
 	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" \
--prefix=${EPREFIX}/usr ${libdir[@]} $@ configure"  
 	CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
-- 
2.18.0


[prev in list] [next in list] [prev in thread] [next in thread]