From 6229813ce8c57da0a7d762ac4a0e3851b126e24f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Dec 2021 09:33:57 +0100 Subject: [PATCH] eclass/cmake-multilib: Support EAPI 6 --- .../portage-stable/eclass/cmake-multilib.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass index b40157dc3f..0cd1ec1218 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass @@ -1,12 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Flatcar: Support EAPI 6. + # @ECLASS: cmake-multilib.eclass # @MAINTAINER: # Michał Górny # @AUTHOR: # Author: Michał Górny -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @PROVIDES: cmake cmake-utils multilib-minimal # @BLURB: cmake wrapper for multilib builds # @DESCRIPTION: @@ -20,7 +22,7 @@ # in multilib-minimal, yet they ought to call appropriate cmake # phase rather than 'default'. -[[ ${EAPI} == 7 ]] && : ${CMAKE_ECLASS:=cmake-utils} +[[ ${EAPI} == [67] ]] && : ${CMAKE_ECLASS:=cmake-utils} # @ECLASS-VARIABLE: CMAKE_ECLASS # @PRE_INHERIT # @DESCRIPTION: @@ -36,7 +38,7 @@ _CMAKE_ECLASS_IMPL=cmake case ${EAPI} in - 7|8) + 6|7|8) case ${CMAKE_ECLASS} in cmake-utils|cmake) ;; *)