| 1 |
commit: 268f10ef6c0bea42edbecd71341953635c9aa4fa |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 09:37:56 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 15 11:43:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268f10ef |
| 7 |
|
| 8 |
cmake-utils.eclass: Port has_version usage handle EAPI=7 |
| 9 |
|
| 10 |
eclass/cmake-utils.eclass | 29 +++++++++++++++++++++++++---- |
| 11 |
1 file changed, 25 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 14 |
index e64502b3b9b..7c76762c495 100644 |
| 15 |
--- a/eclass/cmake-utils.eclass |
| 16 |
+++ b/eclass/cmake-utils.eclass |
| 17 |
@@ -226,9 +226,18 @@ _cmake_generator_to_use() { |
| 18 |
ninja) |
| 19 |
# if ninja is enabled but not installed, the build could fail |
| 20 |
# this could happen if ninja is manually enabled (eg. make.conf) but not installed |
| 21 |
- if ! ROOT=/ has_version dev-util/ninja; then |
| 22 |
- die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." |
| 23 |
- fi |
| 24 |
+ case ${EAPI} in |
| 25 |
+ 5|6) |
| 26 |
+ if ! ROOT=/ has_version dev-util/ninja; then |
| 27 |
+ die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." |
| 28 |
+ fi |
| 29 |
+ ;; |
| 30 |
+ *) |
| 31 |
+ if ! has_version -b dev-util/ninja; then |
| 32 |
+ die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." |
| 33 |
+ fi |
| 34 |
+ ;; |
| 35 |
+ esac |
| 36 |
generator_name="Ninja" |
| 37 |
;; |
| 38 |
emake) |
| 39 |
@@ -511,11 +520,23 @@ cmake-utils_src_configure() { |
| 40 |
# Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus |
| 41 |
# we need to add "<INCLUDES>" |
| 42 |
local includes= |
| 43 |
+ |
| 44 |
+ local has_cmake_340= |
| 45 |
+ case ${EAPI} in |
| 46 |
+ 5|6) |
| 47 |
+ has_cmake_34=$(ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1) |
| 48 |
+ ;; |
| 49 |
+ *) |
| 50 |
+ has_cmake_34=$(has_version -b \>=dev-util/cmake-3.4.0_rc1) |
| 51 |
+ ;; |
| 52 |
+ esac |
| 53 |
+ |
| 54 |
+ |
| 55 |
if [[ ${PN} == cmake ]] ; then |
| 56 |
if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then |
| 57 |
includes="<INCLUDES>" |
| 58 |
fi |
| 59 |
- elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then |
| 60 |
+ elif [[ ${has_cmake_340} ]]; then |
| 61 |
includes="<INCLUDES>" |
| 62 |
fi |
| 63 |
cat > "${build_rules}" <<- _EOF_ || die |
Archives