commit: 00d57471c9761e1e782342129b47bd883fc86abe Author: Chris Mayo <aklhfex <AT> gmail <DOT> com> AuthorDate: Tue Mar 24 19:49:57 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Wed Apr 1 10:34:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d57471
waf-utils.eclass: Replace NO_WAF_LIBDIR with an automatic check Test `waf --help` for --libdir support instead. Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15093 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> eclass/waf-utils.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index a944195b162..7a894f6bbb7 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -69,19 +69,12 @@ waf-utils_src_configure() { [[ ${fail} ]] && die "Invalid use of waf-utils.eclass" - local conf_args=() - # @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} ]] && conf_args+=(--libdir="${EPREFIX}/usr/$(get_libdir)") + local conf_args=() local waf_help=$("${WAF_BINARY}" --help 2>/dev/null) if [[ ${waf_help} == *--docdir* ]]; then @@ -90,6 +83,9 @@ waf-utils_src_configure() { 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
