| 1 |
From: Zentaro Kavanagh <zentaro@××××××××.org> |
| 2 |
|
| 3 |
* WAF uses the PKGCONFIG variable, not the more common PKG_CONFIG |
| 4 |
* Sets the PKGCONFIG variable from tc-getPKG_CONFIG |
| 5 |
|
| 6 |
Closes: https://github.com/gentoo/gentoo/pull/8890 |
| 7 |
--- |
| 8 |
eclass/waf-utils.eclass | 4 ++++ |
| 9 |
1 file changed, 4 insertions(+) |
| 10 |
|
| 11 |
(sent on behalf of pull request submitter) |
| 12 |
|
| 13 |
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass |
| 14 |
index 7acc97b10314..295de5867385 100644 |
| 15 |
--- a/eclass/waf-utils.eclass |
| 16 |
+++ b/eclass/waf-utils.eclass |
| 17 |
@@ -83,6 +83,10 @@ waf-utils_src_configure() { |
| 18 |
[[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)") |
| 19 |
|
| 20 |
tc-export AR CC CPP CXX RANLIB |
| 21 |
+ |
| 22 |
+ # WAF looks for PKGCONFIG not PKG_CONFIG. |
| 23 |
+ local -x PKGCONFIG=$(tc-getPKG_CONFIG) |
| 24 |
+ |
| 25 |
echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir[@]} $@ configure" |
| 26 |
|
| 27 |
CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ |
| 28 |
-- |
| 29 |
2.18.0 |
Archives