dev-python/pytest: arm64 stable (bug #723996)

[gentoo.git] / eclass / waf-utils.eclass

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 4d02483a927e639f7b011d144d0f9355107f5151..7a894f6bbb73f7ced08fe1a7f43a69b4b36efca7 100644 (file)
--- 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
@@ -69,28 +69,39 @@ waf-utils_src_configure() {
 
        [[ ${fail} ]] && die "Invalid use of waf-utils.eclass"
 
-       local libdir=()
-
        # @ECLASS-VARIABLE: WAF_BINARY
        # @DESCRIPTION:
        # Eclass can use different waf executable. Usually it is located in "${S}/waf".
        : ${WAF_BINARY:="${S}/waf"}
 
-       # @ECLASS-VARIABLE: NO_WAF_LIBDIR
-       # @DEFAULT_UNSET
-       # @DESCRIPTION:
-       # Variable specifying that you don't want to set the libdir for waf script.
-       # Some scripts does not allow setting it at all and die if they find it.
-       [[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)")
+       local conf_args=()
+
+       local waf_help=$("${WAF_BINARY}" --help 2>/dev/null)
+       if [[ ${waf_help} == *--docdir* ]]; then
+               conf_args+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
+       fi
+       if [[ ${waf_help} == *--htmldir* ]]; then
+               conf_args+=( --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html )
+       fi
+       if [[ ${waf_help} == *--libdir* ]]; then
+               conf_args+=( --libdir="${EPREFIX}/usr/$(get_libdir)" )
+       fi
 
        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"
+               "${conf_args[@]}"
+               "${@}"
+               configure
+       )
+
+       echo "${CMD[@]@Q}" >&2
+       env "${CMD[@]}" || die "configure failed"
 }
 
 # @FUNCTION: waf-utils_src_compile
@@ -102,8 +113,8 @@ waf-utils_src_compile() {
        [[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
 
        local jobs="--jobs=$(makeopts_jobs)"
-       echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
-       "${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
+       echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs} ${*}"
+       "${WAF_BINARY}" ${_mywafconfig} ${jobs} "${@}" || die "build failed"
 }
 
 # @FUNCTION: waf-utils_src_install
@@ -112,8 +123,8 @@ waf-utils_src_compile() {
 waf-utils_src_install() {
        debug-print-function ${FUNCNAME} "$@"
 
-       echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-       "${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
+       echo "\"${WAF_BINARY}\" --destdir=\"${D}\" ${*} install"
+       "${WAF_BINARY}" --destdir="${D}" "${@}" install  || die "Make install failed"
 
        # Manual document installation
        einstalldocs