From e19211ef43bdb7b101eefd3a1be9a0d7acc3d9e8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Sep 2023 07:12:14 +0000 Subject: [PATCH] eclass/kernel-2: Sync with Gentoo It's from Gentoo commit c5f2fe5daab92a94070cfc41acb543941818c96b. --- .../portage-stable/eclass/kernel-2.eclass | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass index bdeabb9fc2..7b77b64de9 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass @@ -281,23 +281,20 @@ # If you do change them, there is a chance that we will not fix resulting bugs; # that of course does not mean we're not willing to help. -inherit estack multiprocessing toolchain-funcs +# Added by Daniel Ostrow +# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. +# I will remove it when I come up with something more reasonable. +# Alfred Persson Forsberg +# Moved this above inherit as crossdev.eclass uses CHOST internally. +[[ ${PROFILE_ARCH} == ppc64 ]] && CHOST="powerpc64-${CHOST#*-}" + +inherit crossdev estack multiprocessing toolchain-funcs case ${EAPI} in 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -# Added by Daniel Ostrow -# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. -# I will remove it when I come up with something more reasonable. -[[ ${PROFILE_ARCH} == ppc64 ]] && CHOST="powerpc64-${CHOST#*-}" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then - export CTARGET=${CATEGORY/cross-} -fi - HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}" : "${LICENSE:="GPL-2"}"