summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-16 21:14:08 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-16 21:14:08 +0000
commit26f757f5dd8b34ea12359e34cbeeffc84a9fda1a (patch)
treeb8ffd6550909ca1bad2d854cb8f8b059f1c7d208 /dev-java/jruby/files
parentVersion bump (diff)
downloadhistorical-26f757f5dd8b34ea12359e34cbeeffc84a9fda1a.tar.gz
historical-26f757f5dd8b34ea12359e34cbeeffc84a9fda1a.tar.bz2
historical-26f757f5dd8b34ea12359e34cbeeffc84a9fda1a.zip
Fix usage of system nailgun.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-java/jruby/files')
-rw-r--r--dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch
new file mode 100644
index 000000000000..f8fef66fd823
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch
@@ -0,0 +1,18 @@
+Index: jruby-1.4.0/bin/jruby
+===================================================================
+--- jruby-1.4.0.orig/bin/jruby
++++ jruby-1.4.0/bin/jruby
+@@ -308,12 +308,7 @@ if $cygwin; then
+ fi
+
+ if [ "$nailgun_client" != "" ]; then
+- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then
+- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
+- else
+- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun"
+- exit 1
+- fi
++ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
+ else
+ if [ "$VERIFY_JRUBY" != "" ]; then
+ if [ "$PROFILE_ARGS" != "" ]; then