From f5a623e11c21ad02803a91502d4bbb8f6dc69fa1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 28 Nov 2022 07:14:59 +0000 Subject: [PATCH] eclass/ninja-utils: Sync with Gentoo It's from Gentoo commit b591f294b6fa096b0cf9b489169a79a5525cea1d. --- .../portage-stable/eclass/ninja-utils.eclass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 0dffd2eb86..9be502fa8a 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 @@ -62,6 +62,16 @@ case "${NINJA}" in ;; esac +# @FUNCTION: get_NINJAOPTS +# @DESCRIPTION: +# Get the value of NINJAOPTS, inferring them from MAKEOPTS if unset. +get_NINJAOPTS() { + if [[ -z ${NINJAOPTS+set} ]]; then + NINJAOPTS="-j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" + fi + echo "${NINJAOPTS}" +} + # @FUNCTION: eninja # @USAGE: [...] # @DESCRIPTION: @@ -72,11 +82,8 @@ eninja() { local nonfatal_args=() [[ ${EAPI} != 5 ]] && nonfatal_args+=( -n ) - if [[ -z ${NINJAOPTS+set} ]]; then - NINJAOPTS="-j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" - fi [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" - set -- "${NINJA}" -v ${NINJAOPTS} "$@" + set -- "${NINJA}" -v $(get_NINJAOPTS) "$@" echo "$@" >&2 "$@" || die "${nonfatal_args[@]}" "${*} failed" }