| 1 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
| 2 |
--- |
| 3 |
eclass/flag-o-matic.eclass | 17 ++++++++--------- |
| 4 |
1 file changed, 8 insertions(+), 9 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass |
| 7 |
index 0e15d7423547..0dd2c1191273 100644 |
| 8 |
--- a/eclass/flag-o-matic.eclass |
| 9 |
+++ b/eclass/flag-o-matic.eclass |
| 10 |
@@ -4,16 +4,15 @@ |
| 11 |
# @ECLASS: flag-o-matic.eclass |
| 12 |
# @MAINTAINER: |
| 13 |
# toolchain@g.o |
| 14 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
| 15 |
+# @SUPPORTED_EAPIS: 6 7 8 |
| 16 |
# @BLURB: common functions to manipulate and query toolchain flags |
| 17 |
# @DESCRIPTION: |
| 18 |
# This eclass contains a suite of functions to help developers sanely |
| 19 |
# and safely manage toolchain flags in their builds. |
| 20 |
|
| 21 |
-case ${EAPI:-0} in |
| 22 |
- 0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;; |
| 23 |
- 5|6|7|8) ;; |
| 24 |
- *) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;; |
| 25 |
+case ${EAPI} in |
| 26 |
+ 6|7|8) ;; |
| 27 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 28 |
esac |
| 29 |
|
| 30 |
if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then |
| 31 |
@@ -21,7 +20,7 @@ _FLAG_O_MATIC_ECLASS=1 |
| 32 |
|
| 33 |
inherit toolchain-funcs |
| 34 |
|
| 35 |
-[[ ${EAPI} == [567] ]] && inherit eutils |
| 36 |
+[[ ${EAPI} == [67] ]] && inherit eutils |
| 37 |
|
| 38 |
# @FUNCTION: all-flag-vars |
| 39 |
# @DESCRIPTION: |
| 40 |
@@ -36,7 +35,7 @@ all-flag-vars() { |
| 41 |
# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags |
| 42 |
# Note: shell globs and character lists are allowed |
| 43 |
setup-allowed-flags() { |
| 44 |
- [[ ${EAPI} == [567] ]] || |
| 45 |
+ [[ ${EAPI} == [67] ]] || |
| 46 |
die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." |
| 47 |
_setup-allowed-flags "$@" |
| 48 |
} |
| 49 |
@@ -512,7 +511,7 @@ strip-flags() { |
| 50 |
# Returns shell true if <flag> is supported by given <compiler>, |
| 51 |
# else returns shell false. |
| 52 |
test-flag-PROG() { |
| 53 |
- [[ ${EAPI} == [567] ]] || |
| 54 |
+ [[ ${EAPI} == [67] ]] || |
| 55 |
die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." |
| 56 |
_test-flag-PROG "$@" |
| 57 |
} |
| 58 |
@@ -651,7 +650,7 @@ test-flag-CCLD() { _test-flag-PROG CC c+ld "$@"; } |
| 59 |
# Returns shell true if <flags> are supported by given <compiler>, |
| 60 |
# else returns shell false. |
| 61 |
test-flags-PROG() { |
| 62 |
- [[ ${EAPI} == [567] ]] || |
| 63 |
+ [[ ${EAPI} == [67] ]] || |
| 64 |
die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." |
| 65 |
_test-flags-PROG "$@" |
| 66 |
} |
| 67 |
-- |
| 68 |
2.35.1 |
Archives