1 |
Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
2 |
--- |
3 |
eclass/cmake.eclass | 28 ++++++++++++++++++++-------- |
4 |
1 file changed, 20 insertions(+), 8 deletions(-) |
5 |
|
6 |
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass |
7 |
index 137dbc66017..7a8059ba071 100644 |
8 |
--- a/eclass/cmake.eclass |
9 |
+++ b/eclass/cmake.eclass |
10 |
@@ -66,11 +66,23 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
11 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
12 |
|
13 |
# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST |
14 |
+# @PRE_INHERIT |
15 |
+# @DEFAULT_UNSET |
16 |
# @DESCRIPTION: |
17 |
-# Array of CMake modules that will be removed in ${CMAKE_USE_DIR} |
18 |
-# (in EAPI-7: ${S}) during src_prepare, in order to force packages to use the |
19 |
-# system version. Set to empty to disable removing modules entirely. |
20 |
-: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK} |
21 |
+# Array of .cmake modules to be removed in ${CMAKE_USE_DIR} (in EAPI-7: ${S}) |
22 |
+# during src_prepare, in order to force packages to use the system version. |
23 |
+# By default, contains "FindBLAS" and "FindLAPACK". |
24 |
+# Set to empty to disable removing modules entirely. |
25 |
+if [[ ${CMAKE_REMOVE_MODULES_LIST} ]]; then |
26 |
+ if [[ ${EAPI} != 7 ]]; then |
27 |
+ [[ ${CMAKE_REMOVE_MODULES_LIST@a} == *a* ]] || |
28 |
+ die "CMAKE_REMOVE_MODULES_LIST must be an array" |
29 |
+ fi |
30 |
+else |
31 |
+ if ! [[ ${CMAKE_REMOVE_MODULES_LIST@a} == *a* && ${#CMAKE_REMOVE_MODULES_LIST[@]} -eq 0 ]]; then |
32 |
+ CMAKE_REMOVE_MODULES_LIST=( FindBLAS FindLAPACK ) |
33 |
+ fi |
34 |
+fi |
35 |
|
36 |
# @ECLASS-VARIABLE: CMAKE_USE_DIR |
37 |
# @DESCRIPTION: |
38 |
@@ -108,7 +120,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
39 |
|
40 |
[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly" |
41 |
[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR" |
42 |
-[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST=\"\" instead" |
43 |
+[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST array instead" |
44 |
[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead" |
45 |
[[ ${WANT_CMAKE} ]] && die "WANT_CMAKE has been removed and is a no-op" |
46 |
[[ ${PREFIX} ]] && die "PREFIX has been removed and is a no-op" |
47 |
@@ -353,10 +365,10 @@ cmake_src_prepare() { |
48 |
fi |
49 |
|
50 |
local modules_list |
51 |
- if [[ $(declare -p CMAKE_REMOVE_MODULES_LIST) == "declare -a"* ]]; then |
52 |
- modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" ) |
53 |
- else |
54 |
+ if [[ ${EAPI} == 7 && $(declare -p CMAKE_REMOVE_MODULES_LIST) != "declare -a"* ]]; then |
55 |
modules_list=( ${CMAKE_REMOVE_MODULES_LIST} ) |
56 |
+ else |
57 |
+ modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" ) |
58 |
fi |
59 |
|
60 |
local name |
61 |
-- |
62 |
2.33.0 |