diff options
| author |   Marshall Brewer (Gentoo Key) <tomboy64@sina.cn> | 2016-05-09 11:38:19 +0200 |
|---|---|---|
| committer |   Amy Winston <amynka@gentoo.org> | 2016-05-09 12:59:08 +0200 |
| commit | d08438a57084d53bee582fdccc10adc824df71de (patch) | |
| tree | a44fdb1691551919b67f44d1ac4f96bad3a30521 /dev-lang | |
| parent | media-gfx/imagemagick: Bump to version 7.0.1.2 (diff) | |
| download | gentoo-d08438a57084d53bee582fdccc10adc824df71de.tar.gz gentoo-d08438a57084d53bee582fdccc10adc824df71de.tar.bz2 gentoo-d08438a57084d53bee582fdccc10adc824df71de.zip | |
dev-lang/nqp: revbump 2016.04-r2 (fixes compile failure)
Logic error when determining options for Configure.pl.
Gentoo-Bug: 582520
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/nqp/nqp-2016.04-r2.ebuild (renamed from dev-lang/nqp/nqp-2016.04-r1.ebuild) | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/nqp/nqp-2016.04-r1.ebuild b/dev-lang/nqp/nqp-2016.04-r2.ebuild index f3057ed7b0c1..e47071d32bce 100644 --- a/dev-lang/nqp/nqp-2016.04-r1.ebuild +++ b/dev-lang/nqp/nqp-2016.04-r2.ebuild @@ -64,12 +64,18 @@ src_configure() { "--backend=${backends}" "--prefix=/usr" ) - # 2016.04 doesn't like our jna-3.4.1 + # 2016.04 doesn't like our jna-3.4.1 nor jna-4.1.0 # 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$')" ) + 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 + fi perl Configure.pl "${myconfargs[@]}" || die } |