cmake-utils.eclass: Fix usage of has_version
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Sun, 27 May 2018 08:16:41 +0000 (10:16 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Wed, 15 Aug 2018 11:43:35 +0000 (13:43 +0200)
has_version has no output, and its result is provided by exit status.

Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963

eclass/cmake-utils.eclass

index 7c76762c49575996063e17ce7557676666685f3f..31ee9c51072932cc0c89448896509c95d94bb72f 100644 (file)
@@ -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