From a7e2ed12df2443361dc27ae0f7be49706e667c43 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 20 Mar 2023 07:23:55 +0000 Subject: [PATCH] eclass/cmake: Sync with Gentoo It's from Gentoo commit c9a840065a2553871dd298e933da2874bf26062b. --- .../src/third_party/portage-stable/eclass/cmake.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass index 46659867b1..03f2517c5b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass @@ -20,7 +20,7 @@ case ${EAPI} in 7|8) ;; - *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_CMAKE_ECLASS} ]]; then @@ -489,7 +489,7 @@ cmake_src_configure() { # When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers) # we need to tell cmake to use libs/headers from the sysroot but programs from / only. cat >> "${toolchain_file}" <<- _EOF_ || die - set(CMAKE_FIND_ROOT_PATH "${SYSROOT}") + set(CMAKE_SYSROOT "${ESYSROOT}") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)