| 1 |
commit: f94fd00ae0ca39fc553dd8e83f135c0004614e2b |
| 2 |
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 27 16:54:49 2023 +0000 |
| 4 |
Commit: 罗百科 <patrick <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 27 16:56:17 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94fd00a |
| 7 |
|
| 8 |
dev-lang/nqp: Improve java bits |
| 9 |
|
| 10 |
While nqp-j builds now rakudo fails to use it, |
| 11 |
so keep the java useflag masked for now. |
| 12 |
|
| 13 |
Thanks to vaukai for the work in the PR. |
| 14 |
|
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/29299 |
| 16 |
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-lang/nqp/nqp-2023.02.ebuild | 8 ++++---- |
| 19 |
dev-lang/nqp/nqp-9999.ebuild | 19 ++++--------------- |
| 20 |
2 files changed, 8 insertions(+), 19 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/nqp/nqp-2023.02.ebuild b/dev-lang/nqp/nqp-2023.02.ebuild |
| 23 |
index 7ca8384417e3..fc12e500ef7b 100644 |
| 24 |
--- a/dev-lang/nqp/nqp-2023.02.ebuild |
| 25 |
+++ b/dev-lang/nqp/nqp-2023.02.ebuild |
| 26 |
@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )" |
| 27 |
REQUIRED_USE="|| ( java moar )" |
| 28 |
|
| 29 |
CDEPEND="java? ( |
| 30 |
- dev-java/asm:4 |
| 31 |
+ dev-java/asm:9 |
| 32 |
dev-java/jna:4 |
| 33 |
) |
| 34 |
moar? ( ~dev-lang/moarvm-${PV}[clang=] )" |
| 35 |
RDEPEND="${CDEPEND} |
| 36 |
- java? ( >=virtual/jre-1.9 )" |
| 37 |
+ java? ( >=virtual/jre-11 )" |
| 38 |
DEPEND="${CDEPEND}" |
| 39 |
BDEPEND="${CDEPEND} |
| 40 |
clang? ( sys-devel/clang ) |
| 41 |
- java? ( >=virtual/jdk-1.9 ) |
| 42 |
+ java? ( >=virtual/jdk-11 ) |
| 43 |
dev-lang/perl" |
| 44 |
|
| 45 |
pkg_pretend() { |
| 46 |
@@ -69,7 +69,7 @@ nqp_compile() { |
| 47 |
if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then |
| 48 |
emake -j1 \ |
| 49 |
-C "${BUILD_DIR}" \ |
| 50 |
- JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" |
| 51 |
+ JAVAC="$(java-pkg_get-javac)" |
| 52 |
elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then |
| 53 |
emake -j1 \ |
| 54 |
-C "${BUILD_DIR}" |
| 55 |
|
| 56 |
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild |
| 57 |
index 6a9c0f4a7c60..fc12e500ef7b 100644 |
| 58 |
--- a/dev-lang/nqp/nqp-9999.ebuild |
| 59 |
+++ b/dev-lang/nqp/nqp-9999.ebuild |
| 60 |
@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )" |
| 61 |
REQUIRED_USE="|| ( java moar )" |
| 62 |
|
| 63 |
CDEPEND="java? ( |
| 64 |
- dev-java/asm:4 |
| 65 |
+ dev-java/asm:9 |
| 66 |
dev-java/jna:4 |
| 67 |
) |
| 68 |
moar? ( ~dev-lang/moarvm-${PV}[clang=] )" |
| 69 |
RDEPEND="${CDEPEND} |
| 70 |
- java? ( >=virtual/jre-1.8 )" |
| 71 |
+ java? ( >=virtual/jre-11 )" |
| 72 |
DEPEND="${CDEPEND}" |
| 73 |
BDEPEND="${CDEPEND} |
| 74 |
clang? ( sys-devel/clang ) |
| 75 |
- java? ( >=virtual/jdk-1.8 ) |
| 76 |
+ java? ( >=virtual/jdk-11 ) |
| 77 |
dev-lang/perl" |
| 78 |
|
| 79 |
pkg_pretend() { |
| 80 |
@@ -44,16 +44,6 @@ pkg_pretend() { |
| 81 |
fi |
| 82 |
} |
| 83 |
|
| 84 |
-java_prepare() { |
| 85 |
- # Don't clean stage0 jars. |
| 86 |
- einfo "Cleaning upstream jars" |
| 87 |
- java-pkg_clean 3rdparty/ |
| 88 |
- |
| 89 |
- # Don't use jars we just deleted. |
| 90 |
- sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ |
| 91 |
- src/vm/jvm/runners/nqp-j || die |
| 92 |
-} |
| 93 |
- |
| 94 |
src_prepare() { |
| 95 |
MULTIBUILD_VARIANTS=() |
| 96 |
use moar && MULTIBUILD_VARIANTS+=( moar ) |
| 97 |
@@ -79,8 +69,7 @@ nqp_compile() { |
| 98 |
if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then |
| 99 |
emake -j1 \ |
| 100 |
-C "${BUILD_DIR}" \ |
| 101 |
- THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ |
| 102 |
- JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" |
| 103 |
+ JAVAC="$(java-pkg_get-javac)" |
| 104 |
elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then |
| 105 |
emake -j1 \ |
| 106 |
-C "${BUILD_DIR}" |
Archives