| 1 |
Signed-off-by: David Seifert <soap@g.o> |
| 2 |
--- |
| 3 |
eclass/waf-utils.eclass | 19 +++++++++++++------ |
| 4 |
1 file changed, 13 insertions(+), 6 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass |
| 7 |
index 2f4a20cd457..1be02bbea3c 100644 |
| 8 |
--- a/eclass/waf-utils.eclass |
| 9 |
+++ b/eclass/waf-utils.eclass |
| 10 |
@@ -8,20 +8,23 @@ |
| 11 |
# Original Author: Gilles Dartiguelongue <eva@g.o> |
| 12 |
# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@g.o> |
| 13 |
# Proper prefix support: Jonathan Callen <jcallen@g.o> |
| 14 |
-# @SUPPORTED_EAPIS: 6 7 8 |
| 15 |
+# @SUPPORTED_EAPIS: 7 8 |
| 16 |
# @BLURB: common ebuild functions for waf-based packages |
| 17 |
# @DESCRIPTION: |
| 18 |
# The waf-utils eclass contains functions that make creating ebuild for |
| 19 |
# waf-based packages much easier. |
| 20 |
# Its main features are support of common portage default settings. |
| 21 |
|
| 22 |
-inherit multilib toolchain-funcs multiprocessing |
| 23 |
- |
| 24 |
-case ${EAPI:-0} in |
| 25 |
- 6|7|8) EXPORT_FUNCTIONS src_configure src_compile src_install ;; |
| 26 |
- *) die "EAPI=${EAPI} is not supported" ;; |
| 27 |
+case ${EAPI} in |
| 28 |
+ 7|8) ;; |
| 29 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 30 |
esac |
| 31 |
|
| 32 |
+if [[ ! ${_WAF_UTILS_ECLASS} ]]; then |
| 33 |
+_WAF_UTILS_ECLASS=1 |
| 34 |
+ |
| 35 |
+inherit multilib toolchain-funcs multiprocessing |
| 36 |
+ |
| 37 |
# @ECLASS_VARIABLE: WAF_VERBOSE |
| 38 |
# @USER_VARIABLE |
| 39 |
# @DESCRIPTION: |
| 40 |
@@ -141,3 +144,7 @@ waf-utils_src_install() { |
| 41 |
# Manual document installation |
| 42 |
einstalldocs |
| 43 |
} |
| 44 |
+ |
| 45 |
+fi |
| 46 |
+ |
| 47 |
+EXPORT_FUNCTIONS src_configure src_compile src_install |
| 48 |
-- |
| 49 |
2.39.0 |
Archives