1 |
W dniu pią, 18.05.2018 o godzinie 20∶36 +0000, użytkownik Andreas |
2 |
Sturmlechner napisał: |
3 |
> commit: d780c05e4459175eb314c82de9f3b998e2b4fc6e |
4 |
> Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
> AuthorDate: Thu May 10 20:42:15 2018 +0000 |
6 |
> Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
7 |
> CommitDate: Fri May 18 20:36:12 2018 +0000 |
8 |
> URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d780c05e |
9 |
> |
10 |
> cmake-utils.eclass: Switch to eapi7-ver |
11 |
> |
12 |
> eclass/cmake-utils.eclass | 6 +++--- |
13 |
> 1 file changed, 3 insertions(+), 3 deletions(-) |
14 |
> |
15 |
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
16 |
> index 3302f27608b..cbce280625e 100644 |
17 |
> --- a/eclass/cmake-utils.eclass |
18 |
> +++ b/eclass/cmake-utils.eclass |
19 |
> @@ -109,11 +109,11 @@ case ${EAPI} in |
20 |
> *) die "EAPI=${EAPI:-0} is not supported" ;; |
21 |
> esac |
22 |
> |
23 |
> -inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils |
24 |
> +inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils |
25 |
> |
26 |
> case ${EAPI} in |
27 |
> 7) ;; |
28 |
> - *) inherit eutils multilib ;; |
29 |
> + *) inherit eapi7-ver eutils multilib ;; |
30 |
> esac |
31 |
> |
32 |
> EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install |
33 |
> @@ -512,7 +512,7 @@ cmake-utils_src_configure() { |
34 |
> # we need to add "<INCLUDES>" |
35 |
> local includes= |
36 |
> if [[ ${PN} == cmake ]] ; then |
37 |
> - if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then |
38 |
> + if $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then |
39 |
|
40 |
One of the reasons we do mailing list reviews of widely used eclasses is |
41 |
to let people tell you that you've left 'version_is_at_least' here. |
42 |
|
43 |
> includes="<INCLUDES>" |
44 |
> fi |
45 |
> elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then |
46 |
> |
47 |
|
48 |
-- |
49 |
Best regards, |
50 |
Michał Górny |