diff options
| author |   David Seifert <soap@gentoo.org> | 2022-12-27 17:29:59 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2022-12-27 17:29:59 +0100 |
| commit | cf7738d1259d466a912822c2ef4b067d358d332d (patch) | |
| tree | 4c936098057aebc7746df3a15f683849ce5350ff | |
| parent | mozlinguas-v2.eclass: drop EAPI 6, 7 support (diff) | |
| download | gentoo-cf7738d1259d466a912822c2ef4b067d358d332d.tar.gz gentoo-cf7738d1259d466a912822c2ef4b067d358d332d.tar.bz2 gentoo-cf7738d1259d466a912822c2ef4b067d358d332d.zip | |
ninja-utils.eclass: drop EAPI 5, 6 support
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | eclass/ninja-utils.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 9be502fa8ad9..4577e26fa57c 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -8,7 +8,7 @@ # @AUTHOR: # Michał Górny <mgorny@gentoo.org> # Mike Gilbert <floppym@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: common bits to run dev-util/ninja builder # @DESCRIPTION: # This eclass provides a single function -- eninja -- that can be used @@ -19,7 +19,7 @@ # Meson). case ${EAPI} in - 5|6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -76,16 +76,13 @@ get_NINJAOPTS() { # @USAGE: [<args>...] # @DESCRIPTION: # Call Ninja, passing the NINJAOPTS (or converted MAKEOPTS), followed -# by the supplied arguments. This function dies if ninja fails. Starting -# with EAPI 6, it also supports being called via 'nonfatal'. +# by the supplied arguments. This function dies if ninja fails. It +# also supports being called via 'nonfatal'. eninja() { - local nonfatal_args=() - [[ ${EAPI} != 5 ]] && nonfatal_args+=( -n ) - [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" set -- "${NINJA}" -v $(get_NINJAOPTS) "$@" echo "$@" >&2 - "$@" || die "${nonfatal_args[@]}" "${*} failed" + "$@" || die -n "${*} failed" } fi |