diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
| commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
| tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /eclass/waf-utils.eclass | |
| parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) | |
gentoo resync : 22.01.2019
Diffstat (limited to 'eclass/waf-utils.eclass')
| -rw-r--r-- | eclass/waf-utils.eclass | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 878068fc9f4f..2cb26bc8dfd9 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: waf-utils.eclass @@ -84,13 +84,20 @@ waf-utils_src_configure() { [[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)") tc-export AR CC CPP CXX RANLIB - echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir[@]} $@ configure" - CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ - "--prefix=${EPREFIX}/usr" \ - "${libdir[@]}" \ - "${@}" \ - configure || die "configure failed" + local CMD=( + CCFLAGS="${CFLAGS}" + LINKFLAGS="${CFLAGS} ${LDFLAGS}" + PKGCONFIG="$(tc-getPKG_CONFIG)" + "${WAF_BINARY}" + "--prefix=${EPREFIX}/usr" + "${libdir[@]}" + "${@}" + configure + ) + + echo "${CMD[@]@Q}" >&2 + env "${CMD[@]}" || die "configure failed" } # @FUNCTION: waf-utils_src_compile |