commit: 62f2a73782ec6f37cfba662c8eb84a7a126324de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 20:07:35 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 16 19:00:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f2a737
cmake.eclass: Cleanup fatal banned functions and meta variables
All of this was ported away from long ago, cmake-utils.eclass was removed
in 2022.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/cmake.eclass | 91 -----------------------------------------------------
1 file changed, 91 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 0391d37e3398..1c57b8ead962 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -165,13 +165,6 @@ _CMAKE_MINREQVER_CMAKE316=()
# @DESCRIPTION:
# Array of tests that should be skipped when running CTest.
-[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary,
set BDEPEND=\">=dev-build/cmake-${CMAKE_MIN_VERSION}\" directly"
-[[ ${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 array 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"
-
case ${CMAKE_ECM_MODE} in
auto|true|false) ;;
*)
@@ -232,14 +225,6 @@ cmake_comment_add_subdirectory() {
done
}
-# @FUNCTION: comment_add_subdirectory
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use cmake_comment_add_subdirectory instead.
-comment_add_subdirectory() {
- die "comment_add_subdirectory is banned. Use
cmake_comment_add_subdirectory instead"
-}
-
# @FUNCTION: cmake_use_find_package
# @USAGE: <USE flag> <package name>
# @DESCRIPTION:
@@ -258,74 +243,6 @@ cmake_use_find_package() {
echo "-DCMAKE_DISABLE_FIND_PACKAGE_$2=$(use $1 && echo OFF || echo ON)"
}
-# @FUNCTION: _cmake_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_cmake_banned_func() {
- die "${FUNCNAME[1]} is banned. use
-D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-}
-
-# @FUNCTION: cmake-utils_use_with
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DWITH_FOO=$(usex foo) instead.
-cmake-utils_use_with() { _cmake_banned_func WITH_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_enable
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DENABLE_FOO=$(usex foo) instead.
-cmake-utils_use_enable() { _cmake_banned_func ENABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_disable
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DDISABLE_FOO=$(usex !foo) instead.
-cmake-utils_use_disable() { _cmake_banned_func DISABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_no
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DNO_FOO=$(usex !foo) instead.
-cmake-utils_use_no() { _cmake_banned_func NO_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_want
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DWANT_FOO=$(usex foo) instead.
-cmake-utils_use_want() { _cmake_banned_func WANT_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_build
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DBUILD_FOO=$(usex foo) instead.
-cmake-utils_use_build() { _cmake_banned_func BUILD_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_has
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DHAVE_FOO=$(usex foo) instead.
-cmake-utils_use_has() { _cmake_banned_func HAVE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_use
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DUSE_FOO=$(usex foo) instead.
-cmake-utils_use_use() { _cmake_banned_func USE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DFOO=$(usex foo) instead.
-cmake-utils_use() { _cmake_banned_func "" "$@" ; }
-
-# @FUNCTION: cmake-utils_useno
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DNOFOO=$(usex !foo) instead.
-cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
-
# @FUNCTION: _cmake_check_build_dir
# @INTERNAL
# @DESCRIPTION:
@@ -846,14 +763,6 @@ cmake_build() {
popd > /dev/null || die
}
-# @FUNCTION: cmake-utils_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use cmake_build instead.
-cmake-utils_src_make() {
- die "cmake-utils_src_make is banned. Use cmake_build instead"
-}
-
# @ECLASS_VARIABLE: CTEST_JOBS
# @USER_VARIABLE
# @DESCRIPTION:
