1 |
From: David Michael <fedora.dm0@×××××.com> |
2 |
|
3 |
The vala dependencies are declared in BDEPEND since EAPI 7 so that |
4 |
the valac command is natively executable. With no arguments, the |
5 |
has_version function would look for a cross-compiled vala package |
6 |
in the target ROOT and always fail. |
7 |
|
8 |
Signed-off-by: David Michael <fedora.dm0@×××××.com> |
9 |
Signed-off-by: Matt Turner <mattst88@g.o> |
10 |
--- |
11 |
eclass/vala.eclass | 4 ++-- |
12 |
1 file changed, 2 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/eclass/vala.eclass b/eclass/vala.eclass |
15 |
index 52899f163dc..88c5231286a 100644 |
16 |
--- a/eclass/vala.eclass |
17 |
+++ b/eclass/vala.eclass |
18 |
@@ -102,7 +102,7 @@ vala_best_api_version() { |
19 |
u=$(_vala_use_depend) |
20 |
|
21 |
for v in $(vala_api_versions); do |
22 |
- has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return |
23 |
+ has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${v}${u}" && echo "${v}" && return |
24 |
done |
25 |
} |
26 |
|
27 |
@@ -136,7 +136,7 @@ vala_src_prepare() { |
28 |
fi |
29 |
|
30 |
if [[ ${version} ]]; then |
31 |
- has_version "dev-lang/vala:${version}" || die "No installed vala:${version}" |
32 |
+ has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${version}" || die "No installed vala:${version}" |
33 |
else |
34 |
version=$(vala_best_api_version) |
35 |
[[ ${version} ]] || die "No installed vala in $(vala_depend)" |
36 |
-- |
37 |
2.26.2 |