diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-05-27 10:16:41 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2018-05-27 10:44:12 +0200 |
| commit | b6c48cc0aae681ff9b5e9e67398002408dbc3fe5 (patch) | |
| tree | 46e4cf1f68e0caab54eb7a4d38113ba390ca25c9 | |
| parent | ce35b3f34594f3f3dab792589cf042939dd3edf4 (diff) | |
| download | kde-b6c48cc0aae681ff9b5e9e67398002408dbc3fe5.tar.gz kde-b6c48cc0aae681ff9b5e9e67398002408dbc3fe5.tar.bz2 kde-b6c48cc0aae681ff9b5e9e67398002408dbc3fe5.zip | |
cmake-utils.eclass: Fix usage of has_version.
has_version has no output, and its result is provided by exit status.
Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963
| -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 3d571fef081..a9bafef264a 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 |