diff options
| author |   Sam James <sam@gentoo.org> | 2023-12-15 06:50:39 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-12-15 06:50:39 +0000 |
| commit | 2fa125d055dcfebe34acf09ea04ff89c42eeb19b (patch) | |
| tree | 9b346d62b0ab153483c8e3962e109035effe29ad /eclass/ninja-utils.eclass | |
| parent | app-alternatives/ninja: Stabilize 1 arm64, #919969 (diff) | |
| download | gentoo-2fa125d055dcfebe34acf09ea04ff89c42eeb19b.tar.gz gentoo-2fa125d055dcfebe34acf09ea04ff89c42eeb19b.tar.bz2 gentoo-2fa125d055dcfebe34acf09ea04ff89c42eeb19b.zip | |
ninja-utils.eclass: use app-alternatives/ninja
Needed now that it's stable.
Bug: https://bugs.gentoo.org/919969
Closes: https://bugs.gentoo.org/917623
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass/ninja-utils.eclass')
| -rw-r--r-- | eclass/ninja-utils.eclass | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 859938cb3047..8b42c5849522 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -55,17 +55,7 @@ _NINJA_UTILS_ECLASS=1 inherit multiprocessing -case "${NINJA}" in - ninja) - NINJA_DEPEND=">=dev-util/ninja-1.8.2" - ;; - samu) - NINJA_DEPEND="dev-util/samurai" - ;; - *) - NINJA_DEPEND="" - ;; -esac +NINJA_DEPEND="app-alternatives/ninja" # @FUNCTION: get_NINJAOPTS # @DESCRIPTION: @@ -84,7 +74,14 @@ get_NINJAOPTS() { # by the supplied arguments. This function dies if ninja fails. It # also supports being called via 'nonfatal'. eninja() { - [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" + case "${NINJA}" in + ninja|samu) + ;; + *) + ewarn "Unknown value '${NINJA}' for \${NINJA}" + ;; + esac + local v case "${NINJA_VERBOSE}" in OFF) ;; |