gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

cmake-utils.eclass: Fix usage of has_version

Browse Source 
has_version has no output, and its result is provided by exit status.

Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963
This commit is contained in:
Arfrever Frehtes Taifersar Arahesis
2018-05-27 10:16:41 +02:00
committed by Andreas Sturmlechner
parent 268f10ef6c
commit 76bc856dd7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eclass/cmake-utils.eclass
View 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