diff options
Diffstat (limited to 'dev-lang/nqp/nqp-9999.ebuild')
| -rw-r--r-- | dev-lang/nqp/nqp-9999.ebuild | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild index 4354072..6351216 100644 --- a/dev-lang/nqp/nqp-9999.ebuild +++ b/dev-lang/nqp/nqp-9999.ebuild @@ -20,26 +20,27 @@ HOMEPAGE="http://rakudo.org/" LICENSE="Artistic-2" SLOT="0" -IUSE="doc clang java +moar test" +IUSE="doc clang java +moar +system-libs test" REQUIRED_USE="|| ( java moar )" RDEPEND="java? ( >=virtual/jre-1.7:* - dev-java/asm:4 - dev-java/jline:0 ) + system-libs? ( + dev-java/asm:4 + dev-java/jline:0 + ) + ) moar? ( ~dev-lang/moarvm-${PV}[clang=] ) dev-libs/libffi" DEPEND="${RDEPEND} 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 } src_prepare() { - eapply "${PATCHES[@]}" eapply_user use java && java-pkg-2_src_prepare } @@ -54,17 +55,20 @@ src_unpack() { } src_configure() { - # 2016.04 doesn't like our jna-3.4.1 - # keep testing against it local backends use java && backends+="jvm," use moar && backends+="moar" local myconfargs=( "--backend=${backends}" + "--prefix=/usr" ) + + # 2016.04 doesn't like our jna-3.4.1 + # keep testing against it + use system-libs && 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$')" - "--prefix=/usr" ) + "--with-jline=$(echo $(java-pkg_getjars jline) | tr : '\n' | grep '/jline\.jar$')" ) + perl Configure.pl "${myconfargs[@]}" || die } |