diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-10 22:42:15 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-18 22:36:12 +0200 |
| commit | d780c05e4459175eb314c82de9f3b998e2b4fc6e (patch) | |
| tree | 6d32f532163f28c126bf3008b00cb24814bdf892 /eclass/cmake-utils.eclass | |
| parent | net-wireless/osmo-fl2k: minor cleanup (diff) | |
| download | gentoo-d780c05e4459175eb314c82de9f3b998e2b4fc6e.tar.gz gentoo-d780c05e4459175eb314c82de9f3b998e2b4fc6e.tar.bz2 gentoo-d780c05e4459175eb314c82de9f3b998e2b4fc6e.zip | |
cmake-utils.eclass: Switch to eapi7-ver
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 3302f27608b3..cbce280625ef 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -109,11 +109,11 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils +inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils case ${EAPI} in 7) ;; - *) inherit eutils multilib ;; + *) inherit eapi7-ver eutils multilib ;; esac EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install @@ -512,7 +512,7 @@ cmake-utils_src_configure() { # we need to add "<INCLUDES>" local includes= if [[ ${PN} == cmake ]] ; then - if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then + if $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then includes="<INCLUDES>" fi elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then |