| 1 |
commit: fe85423a8fb0061d0e203ad8d4f02ab7849653c6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 17:29:13 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 18:02:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe85423a |
| 7 |
|
| 8 |
waf-utils.eclass: Ban non-python-r1 uses |
| 9 |
|
| 10 |
Apply the ban for waf-utils.eclass uses without any of the python-r1 |
| 11 |
suite eclasses, that was due for almost a year. |
| 12 |
|
| 13 |
eclass/waf-utils.eclass | 36 +++++++++++++++++++++--------------- |
| 14 |
1 file changed, 21 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass |
| 17 |
index e956049..4f08757 100644 |
| 18 |
--- a/eclass/waf-utils.eclass |
| 19 |
+++ b/eclass/waf-utils.eclass |
| 20 |
@@ -41,34 +41,40 @@ DEPEND="${DEPEND} |
| 21 |
waf-utils_src_configure() { |
| 22 |
debug-print-function ${FUNCNAME} "$@" |
| 23 |
|
| 24 |
+ local fail |
| 25 |
if [[ ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then |
| 26 |
- eqawarn "Using waf-utils.eclass without any python-r1 suite eclass is not supported" |
| 27 |
- eqawarn "and will be banned on 2015-01-24. Please make sure to configure and inherit" |
| 28 |
- eqawarn "appropriate -r1 eclass. For more information and examples, please see:" |
| 29 |
- eqawarn " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" |
| 30 |
+ eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported." |
| 31 |
+ eerror "Please make sure to configure and inherit appropriate -r1 eclass." |
| 32 |
+ eerror "For more information and examples, please see:" |
| 33 |
+ eerror " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" |
| 34 |
+ fail=1 |
| 35 |
else |
| 36 |
if [[ ! ${EPYTHON} ]]; then |
| 37 |
- eqawarn "EPYTHON is unset while calling waf-utils. This most likely means that" |
| 38 |
- eqawarn "the ebuild did not call the appropriate eclass function before calling waf." |
| 39 |
+ eerror "EPYTHON is unset while calling waf-utils. This most likely means that" |
| 40 |
+ eerror "the ebuild did not call the appropriate eclass function before calling waf." |
| 41 |
if [[ ${_PYTHON_ANY_R1} ]]; then |
| 42 |
- eqawarn "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." |
| 43 |
+ eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." |
| 44 |
elif [[ ${_PYTHON_SINGLE_R1} ]]; then |
| 45 |
- eqawarn "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." |
| 46 |
+ eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." |
| 47 |
else # python-r1 |
| 48 |
- eqawarn "Please ensure that python_setup is called before waf-utils_src_configure()," |
| 49 |
- eqawarn "or that the latter is used within python_foreach_impl as appropriate." |
| 50 |
+ eerror "Please ensure that python_setup is called before waf-utils_src_configure()," |
| 51 |
+ eerror "or that the latter is used within python_foreach_impl as appropriate." |
| 52 |
fi |
| 53 |
- eqawarn |
| 54 |
+ eerror |
| 55 |
+ fail=1 |
| 56 |
fi |
| 57 |
|
| 58 |
if [[ ${PYTHON_REQ_USE} != *threads* ]]; then |
| 59 |
- eqawarn "Waf requires threading support in Python. To accomodate this requirement," |
| 60 |
- eqawarn "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." |
| 61 |
- eqawarn "For more information and examples, please see:" |
| 62 |
- eqawarn " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" |
| 63 |
+ eerror "Waf requires threading support in Python. To accomodate this requirement," |
| 64 |
+ eerror "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." |
| 65 |
+ eerror "For more information and examples, please see:" |
| 66 |
+ eerror " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" |
| 67 |
+ fail=1 |
| 68 |
fi |
| 69 |
fi |
| 70 |
|
| 71 |
+ [[ ${fail} ]] || die "Invalid use of ${ECLASS}" |
| 72 |
+ |
| 73 |
local libdir="" |
| 74 |
|
| 75 |
# @ECLASS-VARIABLE: WAF_BINARY |
Archives