| 1 |
commit: 82750a31b643c6c6c26c5262b418f3b6e33e46dd |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 18:58:42 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 19:03:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82750a31 |
| 7 |
|
| 8 |
dev-util/bazel: fix JDK/JRE dependencies |
| 9 |
|
| 10 |
The bazel versions in ::gentoo do not build with JDK 17. Restrict to |
| 11 |
suitable JDKs. Also make RDEPEND a JRE dependency. |
| 12 |
|
| 13 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/bazel/bazel-3.7.2-r1.ebuild | 10 +++++++--- |
| 16 |
dev-util/bazel/bazel-4.2.2.ebuild | 8 ++++++-- |
| 17 |
dev-util/bazel/bazel-5.0.0.ebuild | 5 +++-- |
| 18 |
3 files changed, 16 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/bazel/bazel-3.7.2-r1.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 21 |
index db3f1fbbb8c0..1ab7cb5b1b1b 100644 |
| 22 |
--- a/dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 23 |
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2021 Gentoo Authors |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -17,8 +17,12 @@ IUSE="examples tools" |
| 31 |
# strip corrupts the bazel binary |
| 32 |
# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) |
| 33 |
RESTRICT="strip test" |
| 34 |
-RDEPEND=">=virtual/jdk-1.8:*" |
| 35 |
-DEPEND="${RDEPEND} |
| 36 |
+RDEPEND=">=virtual/jre-1.8:*" |
| 37 |
+DEPEND=" |
| 38 |
+ || ( |
| 39 |
+ virtual/jdk:1.8 |
| 40 |
+ virtual/jdk:11 |
| 41 |
+ ) |
| 42 |
app-arch/unzip |
| 43 |
app-arch/zip" |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-util/bazel/bazel-4.2.2.ebuild b/dev-util/bazel/bazel-4.2.2.ebuild |
| 47 |
index a8b93d4ab322..fb8928767133 100644 |
| 48 |
--- a/dev-util/bazel/bazel-4.2.2.ebuild |
| 49 |
+++ b/dev-util/bazel/bazel-4.2.2.ebuild |
| 50 |
@@ -17,8 +17,12 @@ IUSE="examples tools" |
| 51 |
# strip corrupts the bazel binary |
| 52 |
# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) |
| 53 |
RESTRICT="strip test" |
| 54 |
-RDEPEND=">=virtual/jdk-1.8:*" |
| 55 |
-DEPEND="${RDEPEND} |
| 56 |
+RDEPEND=">=virtual/jre-1.8:*" |
| 57 |
+DEPEND=" |
| 58 |
+ || ( |
| 59 |
+ virtual/jdk:1.8 |
| 60 |
+ virtual/jdk:11 |
| 61 |
+ ) |
| 62 |
app-arch/unzip |
| 63 |
app-arch/zip" |
| 64 |
|
| 65 |
|
| 66 |
diff --git a/dev-util/bazel/bazel-5.0.0.ebuild b/dev-util/bazel/bazel-5.0.0.ebuild |
| 67 |
index 778608f34249..36ee3e954ac0 100644 |
| 68 |
--- a/dev-util/bazel/bazel-5.0.0.ebuild |
| 69 |
+++ b/dev-util/bazel/bazel-5.0.0.ebuild |
| 70 |
@@ -17,8 +17,9 @@ IUSE="examples tools" |
| 71 |
# strip corrupts the bazel binary |
| 72 |
# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) |
| 73 |
RESTRICT="strip test" |
| 74 |
-RDEPEND=">=virtual/jdk-11:*" |
| 75 |
-DEPEND="${RDEPEND} |
| 76 |
+RDEPEND=">=virtual/jre-11:*" |
| 77 |
+DEPEND=" |
| 78 |
+ virtual/jdk:11 |
| 79 |
app-arch/unzip |
| 80 |
app-arch/zip" |
Archives