| 1 |
commit: 1e9d5c4c193ae6e442093ac47457e5ed264242de |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 14 11:08:50 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 19 08:13:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9d5c4c |
| 7 |
|
| 8 |
cmake-multilib.eclass: Drop cmake-utils support |
| 9 |
|
| 10 |
cmake-utils.eclass was dropped on 2022-08-01 in commit 3e744f5a. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/834110 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/cmake-multilib.eclass | 30 ++++++++++-------------------- |
| 16 |
1 file changed, 10 insertions(+), 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass |
| 19 |
index 61bacd3d60e3..7e4a86d56756 100644 |
| 20 |
--- a/eclass/cmake-multilib.eclass |
| 21 |
+++ b/eclass/cmake-multilib.eclass |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2021 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
# @ECLASS: cmake-multilib.eclass |
| 28 |
@@ -7,7 +7,7 @@ |
| 29 |
# @AUTHOR: |
| 30 |
# Author: Michał Górny <mgorny@g.o> |
| 31 |
# @SUPPORTED_EAPIS: 7 8 |
| 32 |
-# @PROVIDES: cmake cmake-utils multilib-minimal |
| 33 |
+# @PROVIDES: cmake multilib-minimal |
| 34 |
# @BLURB: cmake wrapper for multilib builds |
| 35 |
# @DESCRIPTION: |
| 36 |
# The cmake-multilib.eclass provides a glue between cmake.eclass(5) |
| 37 |
@@ -20,31 +20,21 @@ |
| 38 |
# in multilib-minimal, yet they ought to call appropriate cmake |
| 39 |
# phase rather than 'default'. |
| 40 |
|
| 41 |
-[[ ${EAPI} == 7 ]] && : ${CMAKE_ECLASS:=cmake-utils} |
| 42 |
# @ECLASS_VARIABLE: CMAKE_ECLASS |
| 43 |
-# @PRE_INHERIT |
| 44 |
+# @DEPRECATED |
| 45 |
# @DESCRIPTION: |
| 46 |
-# Only "cmake" is supported in EAPI-8 and later. |
| 47 |
-# In EAPI-7, default is "cmake-utils" for compatibility. Specify "cmake" for |
| 48 |
-# ebuilds that ported to cmake.eclass already. |
| 49 |
+# Only "cmake" is supported. |
| 50 |
: ${CMAKE_ECLASS:=cmake} |
| 51 |
|
| 52 |
-# @ECLASS_VARIABLE: _CMAKE_ECLASS_IMPL |
| 53 |
-# @INTERNAL |
| 54 |
-# @DESCRIPTION: |
| 55 |
-# TODO: Cleanup once EAPI-7 support is gone. |
| 56 |
-_CMAKE_ECLASS_IMPL=cmake |
| 57 |
- |
| 58 |
case ${EAPI} in |
| 59 |
7|8) |
| 60 |
case ${CMAKE_ECLASS} in |
| 61 |
- cmake-utils|cmake) ;; |
| 62 |
+ cmake) ;; |
| 63 |
*) |
| 64 |
eerror "Unknown value for \${CMAKE_ECLASS}" |
| 65 |
die "Value ${CMAKE_ECLASS} is not supported" |
| 66 |
;; |
| 67 |
esac |
| 68 |
- _CMAKE_ECLASS_IMPL=${CMAKE_ECLASS} |
| 69 |
;; |
| 70 |
*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; |
| 71 |
esac |
| 72 |
@@ -56,7 +46,7 @@ fi |
| 73 |
if [[ -z ${_CMAKE_MULTILIB_ECLASS} ]]; then |
| 74 |
_CMAKE_MULTILIB_ECLASS=1 |
| 75 |
|
| 76 |
-inherit ${_CMAKE_ECLASS_IMPL} multilib-minimal |
| 77 |
+inherit cmake multilib-minimal |
| 78 |
|
| 79 |
cmake-multilib_src_configure() { |
| 80 |
local _cmake_args=( "${@}" ) |
| 81 |
@@ -65,7 +55,7 @@ cmake-multilib_src_configure() { |
| 82 |
} |
| 83 |
|
| 84 |
multilib_src_configure() { |
| 85 |
- ${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}" |
| 86 |
+ cmake_src_configure "${_cmake_args[@]}" |
| 87 |
} |
| 88 |
|
| 89 |
cmake-multilib_src_compile() { |
| 90 |
@@ -75,7 +65,7 @@ cmake-multilib_src_compile() { |
| 91 |
} |
| 92 |
|
| 93 |
multilib_src_compile() { |
| 94 |
- ${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}" |
| 95 |
+ cmake_src_compile "${_cmake_args[@]}" |
| 96 |
} |
| 97 |
|
| 98 |
cmake-multilib_src_test() { |
| 99 |
@@ -85,7 +75,7 @@ cmake-multilib_src_test() { |
| 100 |
} |
| 101 |
|
| 102 |
multilib_src_test() { |
| 103 |
- ${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}" |
| 104 |
+ cmake_src_test "${_cmake_args[@]}" |
| 105 |
} |
| 106 |
|
| 107 |
cmake-multilib_src_install() { |
| 108 |
@@ -95,7 +85,7 @@ cmake-multilib_src_install() { |
| 109 |
} |
| 110 |
|
| 111 |
multilib_src_install() { |
| 112 |
- ${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}" |
| 113 |
+ cmake_src_install "${_cmake_args[@]}" |
| 114 |
} |
| 115 |
|
| 116 |
fi |
Archives