mgorny 15/01/03 14:50:34 Modified: ChangeLog waf-utils.eclass Log: Warn about unset EPYTHON.
Revision Changes Path 1.1496 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1496&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1496&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1495&r2=1.1496 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1495 retrieving revision 1.1496 diff -u -r1.1495 -r1.1496 --- ChangeLog 2 Jan 2015 09:35:02 -0000 1.1495 +++ ChangeLog 3 Jan 2015 14:50:34 -0000 1.1496 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1495 2015/01/02 09:35:02 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1496 2015/01/03 14:50:34 mgorny Exp $ + + 03 Jan 2015; Michał Górny <[email protected]> waf-utils.eclass: + Warn about unset EPYTHON. 02 Jan 2015; Michał Górny <[email protected]> python-utils-r1.eclass: Make python.eclass commands/variables fatal once again since all in-tree 1.22 eclass/waf-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.21&r2=1.22 Index: waf-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- waf-utils.eclass 27 Dec 2014 18:07:31 -0000 1.21 +++ waf-utils.eclass 3 Jan 2015 14:50:34 -0000 1.22 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.21 2014/12/27 18:07:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.22 2015/01/03 14:50:34 mgorny Exp $ # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -46,11 +46,27 @@ eqawarn "and will be banned on 2015-01-24. Please make sure to configure and inherit" eqawarn "appropriate -r1 eclass. For more information and examples, please see:" eqawarn " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration"; - elif [[ ${PYTHON_REQ_USE} != *threads* ]]; then - eqawarn "Waf requires threading support in Python. To accomodate this requirement," - eqawarn "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." - eqawarn "For more information and examples, please see:" - eqawarn " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration"; + else + if [[ ! ${EPYTHON} ]]; then + eqawarn "EPYTHON is unset while calling waf-utils. This most likely means that" + eqawarn "the ebuild did not call the appropriate eclass function before calling waf." + if [[ ${_PYTHON_ANY_R1} ]]; then + eqawarn "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." + elif [[ ${_PYTHON_SINGLE_R1} ]]; then + eqawarn "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." + else # python-r1 + eqawarn "Please ensure that python_setup is called before waf-utils_src_configure()," + eqawarn "or that the latter is used within python_foreach_impl as appropriate." + fi + eqawarn + fi + + if [[ ${PYTHON_REQ_USE} != *threads* ]]; then + eqawarn "Waf requires threading support in Python. To accomodate this requirement," + eqawarn "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." + eqawarn "For more information and examples, please see:" + eqawarn " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration"; + fi fi local libdir=""
