1 |
commit: 0d27cfb7da7fdd62b72a34998eca57c164afedfd |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 28 11:11:07 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 28 11:11:46 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d27cfb7 |
7 |
|
8 |
www-client/chromium: fix java detection |
9 |
|
10 |
Older java versions, e.g., from Java 8, have only '-version', not |
11 |
'--version'. Commited as requested by sam. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/854822 |
14 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
15 |
|
16 |
www-client/chromium/chromium-103.0.5060.53.ebuild | 2 +- |
17 |
www-client/chromium/chromium-104.0.5112.12.ebuild | 2 +- |
18 |
2 files changed, 2 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/www-client/chromium/chromium-103.0.5060.53.ebuild b/www-client/chromium/chromium-103.0.5060.53.ebuild |
21 |
index 6912dfb1e8af..5b22ba929a25 100644 |
22 |
--- a/www-client/chromium/chromium-103.0.5060.53.ebuild |
23 |
+++ b/www-client/chromium/chromium-103.0.5060.53.ebuild |
24 |
@@ -247,7 +247,7 @@ pre_build_checks() { |
25 |
fi |
26 |
fi |
27 |
if use js-type-check; then |
28 |
- "${EPREFIX}"/usr/bin/java --version 2>1 > /dev/null || die "Java VM not setup correctly" |
29 |
+ "${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly" |
30 |
fi |
31 |
fi |
32 |
|
33 |
|
34 |
diff --git a/www-client/chromium/chromium-104.0.5112.12.ebuild b/www-client/chromium/chromium-104.0.5112.12.ebuild |
35 |
index 82f9045bb733..2e826d7e3f0a 100644 |
36 |
--- a/www-client/chromium/chromium-104.0.5112.12.ebuild |
37 |
+++ b/www-client/chromium/chromium-104.0.5112.12.ebuild |
38 |
@@ -257,7 +257,7 @@ pre_build_checks() { |
39 |
fi |
40 |
fi |
41 |
if use js-type-check; then |
42 |
- "${EPREFIX}"/usr/bin/java --version 2>1 > /dev/null || die "Java VM not setup correctly" |
43 |
+ "${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly" |
44 |
fi |
45 |
fi |