From 750205c86fa8f76b3ba4e64ec5f2f306b4561ed2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jan 2024 07:13:14 +0000 Subject: [PATCH] eclass/ninja-utils: Sync with Gentoo It's from Gentoo commit 2fa125d055dcfebe34acf09ea04ff89c42eeb19b. --- .../portage-stable/eclass/ninja-utils.eclass | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass index 859938cb30..8b42c58495 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/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) ;;