[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/
From:       Michał_Górny <mgorny () gentoo ! org>
Date:       2018-05-18 21:53:06
Message-ID: 1526680386.12336.0.camel () gentoo ! org
[Download RAW message or body]

W dniu pią, 18.05.2018 o godzinie 20∶36 +0000, użytkownik Andreas
Sturmlechner napisał:
> commit:     d780c05e4459175eb314c82de9f3b998e2b4fc6e
> Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
> AuthorDate: Thu May 10 20:42:15 2018 +0000
> Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
> CommitDate: Fri May 18 20:36:12 2018 +0000
> URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d780c05e
> 
> cmake-utils.eclass: Switch to eapi7-ver
> 
>  eclass/cmake-utils.eclass | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> index 3302f27608b..cbce280625e 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

One of the reasons we do mailing list reviews of widely used eclasses is
to let people tell you that you've left 'version_is_at_least' here.

>  			includes="<INCLUDES>"
>  		fi
>  	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
> 

-- 
Best regards,
Michał Górny


[prev in list] [next in list] [prev in thread] [next in thread]