diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-16 08:36:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-16 08:36:35 +0000 |
| commit | 61fccfb1c489f310fcdfe05a9fc082f77f894c76 (patch) | |
| tree | 6fc1b053d0beb390cacd27ae2668450041fc7435 /eclass | |
| parent | Remove old version. (diff) | |
| download | gentoo-2-61fccfb1c489f310fcdfe05a9fc082f77f894c76.tar.gz gentoo-2-61fccfb1c489f310fcdfe05a9fc082f77f894c76.tar.bz2 gentoo-2-61fccfb1c489f310fcdfe05a9fc082f77f894c76.zip | |
Don't call python_set_active_version in eclass as it is not really required. Try to set waf binary once more in src_configure as some ebuild lack calls to pkg_setup over this eclass which results into empty WAF_BINARY.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/waf-utils.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 46e125a28fa9..38f1f9fbd440 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.2 2011/01/13 18:43:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.3 2011/01/16 08:36:35 scarabeus Exp $ # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ # waf-based packages much easier. # Its main features are support of common portage default settings. -inherit base eutils multilib python +inherit base eutils multilib case ${EAPI:-0} in 4|3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;; @@ -29,8 +29,6 @@ esac waf-utils_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - python_set_active_version 2 - # @ECLASS-VARIABLE: WAF_BINARY # @DESCRIPTION: # Eclass can use different waf executable. Usually it is located in "${S}/waf". @@ -43,6 +41,10 @@ waf-utils_pkg_setup() { waf-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" + # sometimes people forget to run pkg_setup from this eclass + # instead of having the variable empty lets try to get it once more + : ${WAF_BINARY:="${S}/waf"} + echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure" CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |