diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-07-20 01:37:43 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-07-20 01:37:43 +0000 |
| commit | bfa450b1ee31c824e5652907c59a02b19a767332 (patch) | |
| tree | 587b565ff7c35d4468b1a6454478848b63d22b22 /eclass | |
| parent | Keyword ~ppc64 (diff) | |
| download | historical-bfa450b1ee31c824e5652907c59a02b19a767332.tar.gz historical-bfa450b1ee31c824e5652907c59a02b19a767332.tar.bz2 historical-bfa450b1ee31c824e5652907c59a02b19a767332.zip | |
undo --libdir testing since it breaks with newer portage #427250 and the package that needed this has been rewritten (glmark2)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/waf-utils.eclass | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index b25614105b84..700c9b9094ed 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.12 2012/07/17 04:43:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.13 2012/07/20 01:37:43 vapier Exp $ # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -41,15 +41,11 @@ waf-utils_src_configure() { : ${WAF_BINARY:="${S}/waf"} tc-export AR CC CPP CXX RANLIB - - # Make sure this waf supports --libdir #412133 - if "${WAF_BINARY}" --help | grep -q -e--libdir ; then - set -- "--libdir=${EPREFIX}/usr/$(get_libdir)" "$@" - fi - echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure" + echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure" CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \ + "--libdir=${EPREFIX}/usr/$(get_libdir)" \ "$@" \ configure || die "configure failed" } |