From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7FA02138334 for ; Sat, 21 Dec 2019 10:40:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37B65E08EB; Sat, 21 Dec 2019 10:40:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C830E08EB for ; Sat, 21 Dec 2019 10:40:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 565A934D4D8 for ; Sat, 21 Dec 2019 10:40:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13337988 for ; Sat, 21 Dec 2019 10:40:46 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1576924822.fbfa792a373c42579734e4de4da9b4139edefd80.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fbfa792a373c42579734e4de4da9b4139edefd80 X-VCS-Branch: master Date: Sat, 21 Dec 2019 10:40:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bbac7137-8c71-4342-85c6-37d14e361b20 X-Archives-Hash: 5c7a3b5a03b40d05232fcc1312d63dc4 commit: fbfa792a373c42579734e4de4da9b4139edefd80 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 16 23:12:38 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 21 10:40:22 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbfa792a cmake.eclass: Drop CMAKE_REMOVE_MODULES Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 730a1929fa..0cf10c14a8 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -55,15 +55,11 @@ _CMAKE_ECLASS=1 # The default is set to "ninja". : ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES -# @DESCRIPTION: -# Do we want to remove anything? yes or whatever else for no -: ${CMAKE_REMOVE_MODULES:=yes} - # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST # @DESCRIPTION: # Space-separated list of CMake modules that will be removed in $S during # src_prepare, in order to force packages to use the system version. +# Set to empty to disable removing modules entirely. : ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK} # @ECLASS-VARIABLE: CMAKE_USE_DIR @@ -108,6 +104,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install [[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR" +[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST=\"\" instead" [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead" [[ ${WANT_CMAKE} ]] && die "WANT_CMAKE has been removed and is a no-op" [[ ${PREFIX} ]] && die "PREFIX has been removed and is a no-op" @@ -334,12 +331,10 @@ cmake_src_prepare() { die "FATAL: Unable to find CMakeLists.txt" fi - if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then - local name - for name in ${CMAKE_REMOVE_MODULES_LIST} ; do - find "${S}" -name ${name}.cmake -exec rm -v {} + || die - done - fi + local name + for name in ${CMAKE_REMOVE_MODULES_LIST} ; do + find "${S}" -name ${name}.cmake -exec rm -v {} + || die + done # Remove dangerous things. _cmake_modify-cmakelists