summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Brewer <tomboy64@sina.cn>2016-05-26 17:56:10 +0200
committerAmy Winston <amynka@gentoo.org>2016-06-02 14:52:37 +0200
commitef2f15f048eccbec7e68f754788a3acdbd184450 (patch)
treeba397647782f9d9976394a3444c51d85df5dba8b /dev-lang/rakudo/files
parentdev-lang/rakudo: drop old (2016.01.1 & 2016.02) (diff)
downloadgentoo-ef2f15f048eccbec7e68f754788a3acdbd184450.tar.gz
gentoo-ef2f15f048eccbec7e68f754788a3acdbd184450.tar.bz2
gentoo-ef2f15f048eccbec7e68f754788a3acdbd184450.zip
dev-lang/rakudo: revbump 2016.04-r2
- switched to java-pkg-opt-2 - removed unnecessary DESTDIR hack - not requiring nqp to have USE=-java/-moar, if it's not set for rakudo - enable usage of nqp with system jna (patch and mechanics contributed by Chewi)
Diffstat (limited to 'dev-lang/rakudo/files')
-rw-r--r--dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
new file mode 100644
index 000000000000..3f4532f0d154
--- /dev/null
+++ b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
@@ -0,0 +1,21 @@
+Upstream uses -Xbootclasspath, which prevents us from using
+LD_LIBRARY_PATH, thefore we need to set jna.boot.library.path.
+See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4285197.
+
+Chewi
+2016/05/15
+
+diff -Naur rakudo-2016.04.orig/tools/build/create-jvm-runner.pl rakudo-2016.04/tools/build/create-jvm-runner.pl
+--- rakudo-2016.04.orig/tools/build/create-jvm-runner.pl 2015-12-25 19:23:19.000000000 +0000
++++ rakudo-2016.04/tools/build/create-jvm-runner.pl 2016-05-15 11:30:37.488085661 +0100
+@@ -60,7 +60,10 @@
+ }
+
+ my $classpath = join($cpsep, ($jardir, $libdir, $nqplibdir));
++my $jna_lib = `java-config --query LIBRARY_PATH --package jna-4`;
++chomp $jna_lib;
+ my $jopts = '-noverify -Xms100m -Xbootclasspath/a:' . $perl6jars
++ . ' -Djna.boot.library.path=' . $jna_lib
+ . ' -cp ' . ($^O eq 'MSWin32' ? '"%CLASSPATH%";' : '$CLASSPATH:') . $classpath
+ . ' -Dperl6.prefix=' . $prefix
+ . ' -Djna.library.path=' . $sharedir