gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-lang/nqp: Improve java bits

Browse Source 
While nqp-j builds now rakudo fails to use it,
so keep the java useflag masked for now.

Thanks to vaukai for the work in the PR.

Closes: https://github.com/gentoo/gentoo/pull/29299
Signed-off-by: Patrick Lauer <patrick@gentoo.org>
This commit is contained in:
Patrick Lauer
2023-02-27 16:54:49 +00:00
parent 2ad7471df4
commit f94fd00ae0
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-lang/nqp/nqp-2023.02.ebuild
View File

@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( java moar )"
CDEPEND="java? (
dev-java/asm:4
dev-java/asm:9
dev-java/jna:4
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.9 )"
java? ( >=virtual/jre-11 )"
DEPEND="${CDEPEND}"
BDEPEND="${CDEPEND}
clang? ( sys-devel/clang )
java? ( >=virtual/jdk-1.9 )
java? ( >=virtual/jdk-11 )
dev-lang/perl"
pkg_pretend() {
@@ -69,7 +69,7 @@ nqp_compile() {
if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
emake -j1 \
-C "${BUILD_DIR}" \
JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
JAVAC="$(java-pkg_get-javac)"
elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
emake -j1 \
-C "${BUILD_DIR}"

19
dev-lang/nqp/nqp-9999.ebuild
View File

@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( java moar )"
CDEPEND="java? (
dev-java/asm:4
dev-java/asm:9
dev-java/jna:4
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.8 )"
java? ( >=virtual/jre-11 )"
DEPEND="${CDEPEND}"
BDEPEND="${CDEPEND}
clang? ( sys-devel/clang )
java? ( >=virtual/jdk-1.8 )
java? ( >=virtual/jdk-11 )
dev-lang/perl"
pkg_pretend() {
@@ -44,16 +44,6 @@ pkg_pretend() {
fi
}
java_prepare() {
# Don't clean stage0 jars.
einfo "Cleaning upstream jars"
java-pkg_clean 3rdparty/
# Don't use jars we just deleted.
sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
src/vm/jvm/runners/nqp-j || die
}
src_prepare() {
MULTIBUILD_VARIANTS=()
use moar && MULTIBUILD_VARIANTS+=( moar )
@@ -79,8 +69,7 @@ nqp_compile() {
if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
emake -j1 \
-C "${BUILD_DIR}" \
THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
JAVAC="$(java-pkg_get-javac)"
elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
emake -j1 \
-C "${BUILD_DIR}"