| 1 |
commit: cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed |
| 2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
| 3 |
AuthorDate: Wed May 25 20:44:00 2016 +0000 |
| 4 |
Commit: M. B. <tomboy64 <AT> sina <DOT> cn> |
| 5 |
CommitDate: Thu May 26 11:23:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=cab694e6 |
| 7 |
|
| 8 |
rework java support within nqp and rakudo (thanks chewi!) |
| 9 |
|
| 10 |
dev-lang/nqp/Manifest | 1 + |
| 11 |
dev-lang/nqp/nqp-2016.04-r4.ebuild | 20 +++++++++++++++----- |
| 12 |
dev-lang/rakudo/Manifest | 1 + |
| 13 |
dev-lang/rakudo/rakudo-2016.04-r3.ebuild | 2 +- |
| 14 |
4 files changed, 18 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..19088f1 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-lang/nqp/Manifest |
| 21 |
@@ -0,0 +1 @@ |
| 22 |
+DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 |
| 23 |
|
| 24 |
diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild |
| 25 |
index 6d3e38e..54d68a5 100644 |
| 26 |
--- a/dev-lang/nqp/nqp-2016.04-r4.ebuild |
| 27 |
+++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild |
| 28 |
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then |
| 29 |
else |
| 30 |
SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" |
| 31 |
inherit vcs-snapshot |
| 32 |
- KEYWORDS="" |
| 33 |
+ KEYWORDS="~amd64 ~x86" |
| 34 |
fi |
| 35 |
|
| 36 |
DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" |
| 37 |
@@ -32,14 +32,16 @@ CDEPEND="java? ( |
| 38 |
moar? ( ~dev-lang/moarvm-${PV}[clang=] ) |
| 39 |
dev-libs/libffi" |
| 40 |
RDEPEND="${CDEPEND} |
| 41 |
- java? ( >=virtual/jre-1.7:* )" |
| 42 |
+ java? ( >=virtual/jre-1.7 )" |
| 43 |
DEPEND="${CDEPEND} |
| 44 |
clang? ( sys-devel/clang ) |
| 45 |
- java? ( >=virtual/jdk-1.7:* ) |
| 46 |
+ java? ( >=virtual/jdk-1.7 ) |
| 47 |
dev-lang/perl" |
| 48 |
+PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) |
| 49 |
|
| 50 |
java_prepare() { |
| 51 |
# Don't clean stage0 jars. |
| 52 |
+ einfo "Cleaning upstream jars" |
| 53 |
java-pkg_clean 3rdparty/ |
| 54 |
|
| 55 |
# Don't use jars we just deleted. |
| 56 |
@@ -79,6 +81,16 @@ src_test() { |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
+ if use moar; then |
| 61 |
+ if use java; then |
| 62 |
+ # We need to re-run Configure.pl with only the MoarVM backend, |
| 63 |
+ # so we don't overwrite our custom java install. |
| 64 |
+ # This has to happen before the installation of nqp's MoarVM bits. |
| 65 |
+ # Also, those bits have to get installed before the JVM bits. |
| 66 |
+ perl Configure.pl --backend=moar --prefix=/usr || die |
| 67 |
+ fi |
| 68 |
+ emake DESTDIR="${ED}" install |
| 69 |
+ fi |
| 70 |
if use java; then |
| 71 |
# Set JAVA_PKG_JARDEST early. |
| 72 |
java-pkg_init_paths_ |
| 73 |
@@ -105,8 +117,6 @@ src_install() { |
| 74 |
java-pkg_dolauncher ${PN}-j --main ${PN} |
| 75 |
dosym ${PN}-j /usr/bin/${PN} |
| 76 |
dobin tools/jvm/eval-client.pl |
| 77 |
- else |
| 78 |
- emake DESTDIR="${ED}" install |
| 79 |
fi |
| 80 |
|
| 81 |
dodoc CREDITS README.pod |
| 82 |
|
| 83 |
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest |
| 84 |
new file mode 100644 |
| 85 |
index 0000000..34951ea |
| 86 |
--- /dev/null |
| 87 |
+++ b/dev-lang/rakudo/Manifest |
| 88 |
@@ -0,0 +1 @@ |
| 89 |
+DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6 |
| 90 |
|
| 91 |
diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild |
| 92 |
index 5b8088c..7421cad 100644 |
| 93 |
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild |
| 94 |
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild |
| 95 |
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then |
| 96 |
KEYWORDS="" |
| 97 |
else |
| 98 |
SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" |
| 99 |
- KEYWORDS="" |
| 100 |
+ KEYWORDS="~amd64 ~x86" |
| 101 |
fi |
| 102 |
|
| 103 |
LICENSE="Artistic-2" |
Archives