From 71840cd829b9458be01fe3b7c37a0ae98a9133d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Aug 2024 07:16:30 +0000 Subject: [PATCH] eclass/cmake: Sync with Gentoo It's from Gentoo commit 796a1fc61893f37aa9158ccb2ce4f038e1d1a4db. --- .../src/third_party/portage-stable/eclass/cmake.eclass | 10 ++++++++-- 1 file changed, 8 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 de43bd0177..8079a5cb03 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass @@ -388,7 +388,7 @@ cmake_src_prepare() { local name for name in "${modules_list[@]}" ; do if [[ ${EAPI} == 7 ]]; then - find "${S}" -name ${name}.cmake -exec rm -v {} + || die + find "${S}" -name "${name}.cmake" -exec rm -v {} + || die else find -name "${name}.cmake" -exec rm -v {} + || die fi @@ -542,10 +542,16 @@ cmake_src_configure() { set(BUILD_SHARED_LIBS ON CACHE BOOL "") set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "") set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "") + set(CMAKE_TLS_VERIFY ON CACHE BOOL "") + set(CMAKE_COMPILE_WARNING_AS_ERROR OFF CACHE BOOL "") _EOF_ if [[ -n ${_ECM_ECLASS} ]]; then - echo 'set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die + cat >> ${common_config} <<- _EOF_ || die + set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "") + set(ECM_DISABLE_APPSTREAMTEST ON CACHE BOOL "") + set(ECM_DISABLE_GIT ON CACHE BOOL "") + _EOF_ fi # See bug 689410