Re: [gentoo-dev] [PATCH] vala.eclass: make has_version aware of ROOT for EAPI 7

[Mart Raudsepp]

Ühel kenal päeval, K, 06.01.2021 kell 19:27, kirjutas Matt Turner:
> From: David Michael <fedora.dm0@×××××.com>
>
> The vala dependencies are declared in BDEPEND since EAPI 7 so that
> the valac command is natively executable.  With no arguments, the
> has_version function would look for a cross-compiled vala package
> in the target ROOT and always fail.

I'm not exactly convinced that vapi stuff is arch independent and
belongs in BDEPEND over DEPEND. Vala ships a lot of .vapi files along
with valac that get used on compilation. Though the difference might be
only when different endianness or size_of int


Mart

> Signed-off-by: David Michael <fedora.dm0@×××××.com>
> Signed-off-by: Matt Turner <mattst88@g.o>
> ---
>  eclass/vala.eclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/vala.eclass b/eclass/vala.eclass
> index 52899f163dc..88c5231286a 100644
> --- a/eclass/vala.eclass
> +++ b/eclass/vala.eclass
> @@ -102,7 +102,7 @@ vala_best_api_version() {
>         u=$(_vala_use_depend)
>  
>         for v in $(vala_api_versions); do
> -               has_version "dev-lang/vala:${v}${u}" && echo "${v}"
> && return
> +               has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-
> lang/vala:${v}${u}" && echo "${v}" && return
>         done
>  }
>  
> @@ -136,7 +136,7 @@ vala_src_prepare() {
>         fi
>  
>         if [[ ${version} ]]; then
> -               has_version "dev-lang/vala:${version}" || die "No
> installed vala:${version}"
> +               has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-
> lang/vala:${version}" || die "No installed vala:${version}"
>         else
>                 version=$(vala_best_api_version)
>                 [[ ${version} ]] || die "No installed vala in
> $(vala_depend)"