* [gentoo-dev] [PATCH 2/2] cmake-multilib.eclass: Add CMAKE_ECLASS switch
@ 2019-12-23 23:11 99% ` Andreas Sturmlechner
0 siblings, 0 replies; 1+ results
From: Andreas Sturmlechner @ 2019-12-23 23:11 UTC (permalink / raw
To: gentoo-dev
For transition from cmake-utils.eclass to cmake.eclass.
---
eclass/cmake-multilib.eclass | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 9d617900b73..2693d9c72e2 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: cmake-multilib.eclass
@@ -19,6 +19,12 @@
# in multilib-minimal, yet they ought to call appropriate cmake-utils
# phase rather than 'default'.
+# @ECLASS-VARIABLE: CMAKE_ECLASS
+# @DESCRIPTION:
+# Default is "cmake-utils" for compatibility. Specify "cmake" for ebuilds
+# that ported from cmake-utils.eclass to cmake.eclass already.
+: ${CMAKE_ECLASS:=cmake-utils}
+
case ${EAPI:-0} in
[67]) ;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -28,7 +34,15 @@ if [[ ${CMAKE_IN_SOURCE_BUILD} ]]; then
die "${ECLASS}: multilib support requires out-of-source builds."
fi
-inherit cmake-utils multilib-minimal
+case ${CMAKE_ECLASS} in
+ cmake-utils|cmake) ;;
+ *)
+ eerror "Unknown value for \${CMAKE_ECLASS}"
+ die "Value ${CMAKE_ECLASS} is not supported"
+ ;;
+esac
+
+inherit ${CMAKE_ECLASS} multilib-minimal
EXPORT_FUNCTIONS src_configure src_compile src_test src_install
@@ -39,7 +53,7 @@ cmake-multilib_src_configure() {
}
multilib_src_configure() {
- cmake-utils_src_configure "${_cmake_args[@]}"
+ ${CMAKE_ECLASS}_src_configure "${_cmake_args[@]}"
}
cmake-multilib_src_compile() {
@@ -49,7 +63,7 @@ cmake-multilib_src_compile() {
}
multilib_src_compile() {
- cmake-utils_src_compile "${_cmake_args[@]}"
+ ${CMAKE_ECLASS}_src_compile "${_cmake_args[@]}"
}
cmake-multilib_src_test() {
@@ -59,7 +73,7 @@ cmake-multilib_src_test() {
}
multilib_src_test() {
- cmake-utils_src_test "${_cmake_args[@]}"
+ ${CMAKE_ECLASS}_src_test "${_cmake_args[@]}"
}
cmake-multilib_src_install() {
@@ -69,5 +83,5 @@ cmake-multilib_src_install() {
}
multilib_src_install() {
- cmake-utils_src_install "${_cmake_args[@]}"
+ ${CMAKE_ECLASS}_src_install "${_cmake_args[@]}"
}
---
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-12-23 23:08 [gentoo-dev] [PATCH 1/2] cmake.eclass: New eclass, a cmake-utils cleanup for >=EAPI-7 Andreas Sturmlechner
2019-12-23 23:11 99% ` [gentoo-dev] [PATCH 2/2] cmake-multilib.eclass: Add CMAKE_ECLASS switch Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox