From 3ba5570ef357eca1b99025a61bead5e6700d2174 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Dec 2021 10:50:24 +0100 Subject: [PATCH] eclass/ninja-utils: Support EAPI 4 --- .../third_party/portage-stable/eclass/ninja-utils.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 c5e195a9f8..e69244b39f 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 @@ -1,6 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Flatcar: Support EAPI 4. + # @ECLASS: ninja-utils.eclass # @MAINTAINER: # Michał Górny @@ -8,7 +10,7 @@ # @AUTHOR: # Michał Górny # Mike Gilbert -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 4 5 6 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 +21,7 @@ # Meson). case ${EAPI} in - 5|6|7|8) ;; + 4|5|6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -43,7 +45,7 @@ inherit multiprocessing # with EAPI 6, it also supports being called via 'nonfatal'. eninja() { local nonfatal_args=() - [[ ${EAPI} != 5 ]] && nonfatal_args+=( -n ) + [[ ${EAPI} != [45] ]] && nonfatal_args+=( -n ) if [[ -z ${NINJAOPTS+set} ]]; then NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"