diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-05-27 10:16:41 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-15 13:43:35 +0200 |
| commit | 76bc856dd7f5863fa41da9b1248d76b94786b0f1 (patch) | |
| tree | 11269bb1bb3e02921f169a0c0be375006db95130 /eclass/cmake-utils.eclass | |
| parent | cmake-utils.eclass: Port has_version usage handle EAPI=7 (diff) | |
| download | gentoo-76bc856dd7f5863fa41da9b1248d76b94786b0f1.tar.gz gentoo-76bc856dd7f5863fa41da9b1248d76b94786b0f1.tar.bz2 gentoo-76bc856dd7f5863fa41da9b1248d76b94786b0f1.zip | |
cmake-utils.eclass: Fix usage of has_version
has_version has no output, and its result is provided by exit status.
Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 7c76762c4957..31ee9c510729 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -521,14 +521,14 @@ cmake-utils_src_configure() { # we need to add "<INCLUDES>" local includes= - local has_cmake_340= + local has_cmake_3_4_0=false case ${EAPI} in 5|6) - has_cmake_34=$(ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1) - ;; + ROOT=/ has_version ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true + ;; *) - has_cmake_34=$(has_version -b \>=dev-util/cmake-3.4.0_rc1) - ;; + has_version -b ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true + ;; esac @@ -536,7 +536,7 @@ cmake-utils_src_configure() { if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then includes="<INCLUDES>" fi - elif [[ ${has_cmake_340} ]]; then + elif ${has_cmake_3_4_0}; then includes="<INCLUDES>" fi cat > "${build_rules}" <<- _EOF_ || die |