eclass/ninja-utils: Sync with Gentoo

It's from Gentoo commit b591f294b6fa096b0cf9b489169a79a5525cea1d.
This commit is contained in:
Flatcar Buildbot 2022-11-28 07:14:59 +00:00
parent 3aacc4b38a
commit f5a623e11c

View File

@ -62,6 +62,16 @@ case "${NINJA}" in
;; ;;
esac 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 # @FUNCTION: eninja
# @USAGE: [<args>...] # @USAGE: [<args>...]
# @DESCRIPTION: # @DESCRIPTION:
@ -72,11 +82,8 @@ eninja() {
local nonfatal_args=() local nonfatal_args=()
[[ ${EAPI} != 5 ]] && nonfatal_args+=( -n ) [[ ${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}" [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}"
set -- "${NINJA}" -v ${NINJAOPTS} "$@" set -- "${NINJA}" -v $(get_NINJAOPTS) "$@"
echo "$@" >&2 echo "$@" >&2
"$@" || die "${nonfatal_args[@]}" "${*} failed" "$@" || die "${nonfatal_args[@]}" "${*} failed"
} }