public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "罗百科" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/
Date: Wed, 23 Jun 2021 15:17:30 +0000 (UTC)	[thread overview]
Message-ID: <1624461447.e8893ba08d83898955980954435554cb5acf4bb1.patrick@gentoo> (raw)

commit:     e8893ba08d83898955980954435554cb5acf4bb1
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 15:15:43 2021 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 15:17:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8893ba0

dev-lang/nqp: Bump to 2021.06

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-lang/nqp/Manifest           |   1 +
 dev-lang/nqp/nqp-2021.06.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index a917b03a86f..7f060c48ab4 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,3 +1,4 @@
 DIST nqp-2020.11.tar.gz 3954688 BLAKE2B d273c78c8f2083908b2815dc10787fec31404eb13c1e64253e7e5ae896d27a3755cf5c8045d47c4f465178568731e0d74951db6e45d103cf3ee18470124e97e0 SHA512 51b5e7f9d290bca7ada24cf9c12c61608be92269fc848976cada49f7445694e0f26929b5f9e90a9153eb379f0d74a6bb8068cd5ebf383d4501f75535b70e7605
 DIST nqp-2020.12.tar.gz 3957981 BLAKE2B d45ad66ebb0788db6e7191b4b7af4093b73e63e5f66ab4ccab62163b0285adb7d4e18a7c906c34f99dd63e0920f4d6e16e11005eb5df1d726796e9f106f9c4f8 SHA512 4ce87dc868c91565ebe896db766403bb018b2f5ea919bd0fb5b173498ba124712ffa795ec4e219240e5aabb59c55285bee5e46d3ac3d5869fc445b0ab3ea8485
 DIST nqp-2021.02.tar.gz 3987077 BLAKE2B 3f67e33b948805a7c4dad1999e310d36da0cd8d4663b20ada5af6079c8ad2966c1f65e9f24c620f16480b7dea42a166f73fec61f3849e2cdd79b28ec017b0d7f SHA512 ff6cf66f4c1d9bccbd4cc5f52e49d380aaeef3fa060ced9e1da6c233e674fa90c08a5f1fa86e1a7beb5661d1271454934b520ba3e07e27cebaece343be84bdfe
+DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe

diff --git a/dev-lang/nqp/nqp-2021.06.ebuild b/dev-lang/nqp/nqp-2021.06.ebuild
new file mode 100644
index 00000000000..81e93919b90
--- /dev/null
+++ b/dev-lang/nqp/nqp-2021.06.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.8 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	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 )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=${EPREFIX}/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+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)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}


             reply	other threads:[~2021-06-23 15:17 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23 15:17 罗百科 [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-30 15:08 [gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/ Patrick Lauer
2024-08-30 15:08 Patrick Lauer
2024-06-24  9:26 Patrick Lauer
2024-05-06  9:04 Patrick Lauer
2024-05-06  9:04 Patrick Lauer
2024-03-16 13:02 Patrick Lauer
2024-03-16 13:02 Patrick Lauer
2024-03-16 13:02 Patrick Lauer
2024-01-06  6:19 罗百科
2023-10-30  6:57 罗百科
2023-02-27 16:56 罗百科
2023-02-27 16:43 罗百科
2023-02-27 16:43 罗百科
2023-02-27 16:43 罗百科
2023-02-27 16:43 罗百科
2022-06-21 13:50 罗百科
2022-03-03 18:17 罗百科
2021-12-13  0:25 Andreas K. Hüttel
2021-11-25 13:51 罗百科
2021-08-29 15:13 罗百科
2021-06-23 15:17 罗百科
2021-05-16 21:08 Andreas K. Hüttel
2021-03-26 19:46 Conrad Kostecki
2021-02-22 16:18 罗百科
2020-12-31  7:22 罗百科
2020-11-30  6:20 罗百科
2020-10-26 16:27 罗百科
2020-10-04 13:24 罗百科
2020-08-24  5:00 罗百科
2020-08-24  5:00 罗百科
2020-08-13  5:22 罗百科
2020-07-09 14:33 罗百科
2020-06-08 15:32 罗百科
2019-12-25 11:31 罗百科
2019-12-25 11:29 罗百科
2019-08-07 11:42 Kent Fredric
2019-08-07 11:42 Kent Fredric
2019-08-07 11:42 Kent Fredric
2019-08-07 11:42 Kent Fredric
2019-08-07 11:42 Kent Fredric
2019-08-07 11:42 Kent Fredric
2019-03-16 16:57 Patrick Lauer
2019-01-26 15:49 Patrick Lauer
2018-09-29  7:04 Patrick Lauer
2018-09-29  7:04 Patrick Lauer
2018-09-10 16:56 Patrick Lauer
2018-07-07  6:49 Patrick Lauer
2018-05-26 16:30 Patrick Lauer
2018-05-13 19:20 Aaron Bauman
2018-05-04 18:11 Patrick Lauer
2018-04-29 18:40 Patrick Lauer
2018-03-30 15:54 Patrick Lauer
2018-02-27 17:13 Patrick Lauer
2018-02-22 18:57 Patrick Lauer
2018-02-13 19:16 Patrick Lauer
2018-01-13 15:21 Patrick Lauer
2017-12-16 16:13 Patrick Lauer
2017-11-02  6:19 Patrick Lauer
2017-09-22 18:46 Patrick Lauer
2017-09-22 18:46 Patrick Lauer
2017-09-16  5:54 Patrick Lauer
2017-07-28  9:29 Patrick Lauer
2017-06-26 13:50 Patrick Lauer
2017-06-03  7:06 Patrick Lauer
2017-04-25 11:10 Patrick Lauer
2017-04-08  6:57 Patrick Lauer
2017-03-10 15:58 Patrick Lauer
2017-01-28 21:16 Patrick Lauer
2016-12-28 17:23 Patrick Lauer
2016-12-28 17:23 Patrick Lauer
2016-11-25 18:53 Patrick Lauer
2016-10-20 16:49 Patrick Lauer
2016-09-30 13:13 Patrick Lauer
2016-08-23 14:51 Patrick Lauer
2016-07-20  9:18 Patrick Lauer
2016-06-28 12:29 Patrick Lauer
2016-06-02 12:55 Amy Winston
2016-06-02 12:55 Amy Winston
2016-06-02 12:55 Amy Winston
2016-06-02 12:55 Amy Winston
2016-05-09 11:03 Amy Winston
2016-05-08 20:21 Amy Winston
2016-05-02 14:56 Patrick Lauer
2016-03-24 11:39 Patrick Lauer
2016-02-23 10:31 Patrick Lauer
2016-02-09  9:47 Patrick Lauer
2016-02-03 15:14 Patrick Lauer
2016-01-03 13:05 Patrick Lauer
2015-12-21  9:31 Patrick Lauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1624461447.e8893ba08d83898955980954435554cb5acf4bb1.patrick@gentoo \
    --to=patrick@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox