diff options
Diffstat (limited to 'dev-lang/nqp')
| -rw-r--r-- | dev-lang/nqp/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/nqp/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-lang/nqp/nqp-2016.04-r3.ebuild | 159 | ||||
| -rw-r--r-- | dev-lang/nqp/nqp-2016.04-r4.ebuild | 124 | ||||
| -rw-r--r-- | dev-lang/nqp/nqp-2016.05.ebuild (renamed from dev-lang/nqp/nqp-2016.04-r5.ebuild) | 99 | ||||
| -rw-r--r-- | dev-lang/nqp/nqp-9999.ebuild | 159 |
6 files changed, 327 insertions, 216 deletions
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index 19088f1..3bbe823 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1 +1,2 @@ DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 +DIST nqp-2016.05.tar.gz 5159647 SHA256 7fdd76322383632783b4352e8fab144c3d68acbfda5112c1f178d8909277f616 SHA512 c81d2f6ef13fad36ed863869c985049a5e1daa04e979449fbbd3b5b365ff58430711f6a7ed5ac10ff61fe6a78d4f960f76ade7445ecb82eb3100882449747a61 WHIRLPOOL 119237accc6723db4afa27cdbb1409e9d11a572bf24fbd83e8bed3c507193bf2199bb5a1e8a27052d922040892f5ce35ffd30640218bbc15167fff88e70941c7 diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml index dd228ef..7d0e9d2 100644 --- a/dev-lang/nqp/metadata.xml +++ b/dev-lang/nqp/metadata.xml @@ -16,7 +16,6 @@ <use> <flag name="clang">Toggle usage of the clang compiler in conjunction with MoarVM</flag> <flag name="moar">Build the MoarVM backend (experimental/broken)</flag> - <flag name="system-libs">Use jars provided by the system instead of upstream</flag> </use> <upstream> <remote-id type="github">perl6/nqp</remote-id> diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild index 47c7906..3d3e1b3 100644 --- a/dev-lang/nqp/nqp-2016.04-r3.ebuild +++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 -inherit java-pkg-2 +inherit java-pkg-opt-2 multibuild if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/perl6/${PN}.git" @@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]]; then KEYWORDS="" else SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - KEYWORDS="" + inherit vcs-snapshot + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" @@ -20,80 +21,140 @@ HOMEPAGE="http://rakudo.org/" LICENSE="Artistic-2" SLOT="0" -IUSE="doc clang java +moar +system-libs test" +IUSE="doc clang java +moar test" REQUIRED_USE="|| ( java moar )" -RDEPEND="java? ( >=virtual/jre-1.7 - system-libs? ( - dev-java/asm:4 - dev-java/jline:0 - ) +CDEPEND="java? ( + dev-java/asm:4 + dev-java/jline:0 + dev-java/jna:4 ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] ) - dev-libs/libffi" -DEPEND="${RDEPEND} + moar? ( ~dev-lang/moarvm-${PV}[clang=] )" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.7 )" +DEPEND="${CDEPEND} clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl" PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) -pkg_setup() { - use java && java-pkg-2_pkg_setup +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 them before" + ewarn "reporting a bug." + fi } -src_prepare() { - eapply "${PATCHES[@]}" - eapply_user - use java && java-pkg-2_src_prepare +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_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_src_unpack - else - unpack ${A} - mv "${WORKDIR}/perl6-nqp-"* "${WORKDIR}/${P}" || die - fi +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 } -src_configure() { - local backends - use java && backends+="jvm," - use moar && backends+="moar" +nqp_configure() { + pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( - "--backend=${backends}" + "--backend=${MULTIBUILD_VARIANT}" "--prefix=/usr" ) - # 2016.04 doesn't like our jna-3.4.1 nor jna-4.1.0 - # keep testing against it - if use system-libs; then - if use java; then - myconfargs+=( - "--with-asm=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | grep '/asm\.jar$')" - "--with-asm-tree=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | grep '/asm-tree\.jar$')" - "--with-jline=$(echo $(java-pkg_getjars jline) | tr : '\n' | grep '/jline\.jar$')" ) - else - einfo "USE=system-libs set, but this won't have any effect without USE=java." - fi + 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 +} - perl Configure.pl "${myconfargs[@]}" || die +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() { - emake -j1 + multibuild_foreach_variant nqp_compile } src_test() { - emake -j1 test + multibuild_foreach_variant nqp_test } src_install() { - emake DESTDIR="${ED}" install + multibuild_foreach_variant nqp_install dodoc CREDITS README.pod - - if use doc; then - dodoc -r docs/* - fi + use doc && dodoc -r docs/* } diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild deleted file mode 100644 index 02c414d..0000000 --- a/dev-lang/nqp/nqp-2016.04-r4.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar 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=] ) - dev-libs/libffi" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - 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. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_configure() { - local backends - use java && backends+="jvm," - use moar && backends+="moar" - - local myconfargs=( - "--backend=${backends}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - - if use java; then - # Export this for the script we sed'd above. - export THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) - fi -} - -src_compile() { - if use java; then - emake -j1 \ - THIRDPARTY_JARS="${THIRDPARTY_JARS}" \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - else - emake -j1 - fi -} - -src_test() { - emake -j1 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_ - - # 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 - fi - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.04-r5.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild index 4f0bf1f..c142ddf 100644 --- a/dev-lang/nqp/nqp-2016.04-r5.ebuild +++ b/dev-lang/nqp/nqp-2016.05.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" @@ -29,15 +29,21 @@ CDEPEND="java? ( dev-java/jline:0 dev-java/jna:4 ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] ) - dev-libs/libffi" + moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.7 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl" -PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) + +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 them before" + ewarn "reporting a bug." + fi +} java_prepare() { # Don't clean stage0 jars. @@ -71,57 +77,66 @@ nqp_configure() { } nqp_compile() { - pushd "${BUILD_DIR}" > /dev/null || die if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then emake -j1 \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) + -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 + emake -j1 \ + -C "${BUILD_DIR}" fi - popd || die } nqp_test() { - pushd "${BUILD_DIR}" > /dev/null || die - emake -j1 test - popd || die + emake -j1 \ + -C "${BUILD_DIR}" \ + test } nqp_install() { - pushd "${BUILD_DIR}" > /dev/null || die # This is the actual reason we need multibuild.eclass. # We need to distinguish the install procedure for MoarVM and JVM backends. - if [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake DESTDIR="${ED}" install - elif [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - # 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 - fi - popd || die + 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() { diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild new file mode 100644 index 0000000..c142ddf --- /dev/null +++ b/dev-lang/nqp/nqp-9999.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit java-pkg-opt-2 multibuild + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/perl6/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" + inherit vcs-snapshot + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="http://rakudo.org/" + +LICENSE="Artistic-2" +SLOT="0" +IUSE="doc clang java +moar 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.7 )" +DEPEND="${CDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.7 ) + 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 them before" + ewarn "reporting a bug." + 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=/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/* +} |