From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FE42158030 for ; Mon, 27 Feb 2023 16:56:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90042E07C9; Mon, 27 Feb 2023 16:56:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 456D9E07C9 for ; Mon, 27 Feb 2023 16:56:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A04833BE58 for ; Mon, 27 Feb 2023 16:56:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 347CF7D0 for ; Mon, 27 Feb 2023 16:56:19 +0000 (UTC) From: "罗百科" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "罗百科" Message-ID: <1677516977.f94fd00ae0ca39fc553dd8e83f135c0004614e2b.patrick@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/nqp/nqp-2023.02.ebuild dev-lang/nqp/nqp-9999.ebuild X-VCS-Directories: dev-lang/nqp/ X-VCS-Committer: patrick X-VCS-Committer-Name: 罗百科 X-VCS-Revision: f94fd00ae0ca39fc553dd8e83f135c0004614e2b X-VCS-Branch: master Date: Mon, 27 Feb 2023 16:56:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e54e8ffb-b7b5-4e8c-8490-9eeabcb834ea X-Archives-Hash: 6decfdb3a14f188f52c24cf4efded02c commit: f94fd00ae0ca39fc553dd8e83f135c0004614e2b Author: Patrick Lauer gentoo org> AuthorDate: Mon Feb 27 16:54:49 2023 +0000 Commit: 罗百科 gentoo org> CommitDate: Mon Feb 27 16:56:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94fd00a dev-lang/nqp: Improve java bits 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 gentoo.org> dev-lang/nqp/nqp-2023.02.ebuild | 8 ++++---- dev-lang/nqp/nqp-9999.ebuild | 19 ++++--------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dev-lang/nqp/nqp-2023.02.ebuild b/dev-lang/nqp/nqp-2023.02.ebuild index 7ca8384417e3..fc12e500ef7b 100644 --- a/dev-lang/nqp/nqp-2023.02.ebuild +++ b/dev-lang/nqp/nqp-2023.02.ebuild @@ -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}" diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild index 6a9c0f4a7c60..fc12e500ef7b 100644 --- a/dev-lang/nqp/nqp-9999.ebuild +++ b/dev-lang/nqp/nqp-9999.ebuild @@ -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}"