diff options
| author |   Matthew Brewer <tomboy64@sina.cn> | 2016-05-25 22:44:00 +0200 |
|---|---|---|
| committer | Matthew Brewer <tomboy64@sina.cn> | 2016-05-26 13:23:59 +0200 |
| commit | cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed (patch) | |
| tree | 9d06a89617ebc5acd43964e31afe565603dd2784 | |
| parent | new experimental perl6 ebuilds (diff) | |
| download | tbc-cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed.tar.gz tbc-cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed.tar.bz2 tbc-cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed.zip | |
rework java support within nqp and rakudo (thanks chewi!)
| -rw-r--r-- | dev-lang/nqp/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/nqp/nqp-2016.04-r4.ebuild | 20 | ||||
| -rw-r--r-- | dev-lang/rakudo/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/rakudo/rakudo-2016.04-r3.ebuild | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest new file mode 100644 index 0000000..19088f1 --- /dev/null +++ b/dev-lang/nqp/Manifest @@ -0,0 +1 @@ +DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild index 6d3e38e..54d68a5 100644 --- a/dev-lang/nqp/nqp-2016.04-r4.ebuild +++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then else SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" inherit vcs-snapshot - KEYWORDS="" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" @@ -32,14 +32,16 @@ CDEPEND="java? ( moar? ( ~dev-lang/moarvm-${PV}[clang=] ) dev-libs/libffi" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7:* )" + java? ( >=virtual/jre-1.7 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7:* ) + java? ( >=virtual/jdk-1.7 ) dev-lang/perl" +PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) java_prepare() { # Don't clean stage0 jars. + einfo "Cleaning upstream jars" java-pkg_clean 3rdparty/ # Don't use jars we just deleted. @@ -79,6 +81,16 @@ src_test() { } src_install() { + if use moar; then + if use java; then + # We need to re-run Configure.pl with only the MoarVM backend, + # so we don't overwrite our custom java install. + # This has to happen before the installation of nqp's MoarVM bits. + # Also, those bits have to get installed before the JVM bits. + perl Configure.pl --backend=moar --prefix=/usr || die + fi + emake DESTDIR="${ED}" install + fi if use java; then # Set JAVA_PKG_JARDEST early. java-pkg_init_paths_ @@ -105,8 +117,6 @@ src_install() { java-pkg_dolauncher ${PN}-j --main ${PN} dosym ${PN}-j /usr/bin/${PN} dobin tools/jvm/eval-client.pl - else - emake DESTDIR="${ED}" install fi dodoc CREDITS README.pod diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest new file mode 100644 index 0000000..34951ea --- /dev/null +++ b/dev-lang/rakudo/Manifest @@ -0,0 +1 @@ +DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6 diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild index 5b8088c..7421cad 100644 --- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild +++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then KEYWORDS="" else SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="" + KEYWORDS="~amd64 ~x86" fi LICENSE="Artistic-2" |