← Back to branch summary

~ubuntu-branches/ubuntu/wily/jruby/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0002-jruby_home-is-at-a-specific-location-on-Debian.patch

  • Committer: Package Import Robot
  • Author(s): Torsten Werner
  • Date: 2011-09-18 19:24:44 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: package-import@ubuntu.com-20110918192444-zsetldu26up4ccsh
Tags: 1.5.1+dfsg4-2
Use yecht-ruby.jar for building.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-jruby_home-is-at-a-specific-location-on-Debian.patch
1
1
From: Sebastien Delafond <seb@debian.org>
2
2
Date: Thu, 29 Jul 2010 19:46:38 +0200
3
 
Subject: [PATCH] jruby_home is at a specific location on Debian
 
3
Subject: jruby_home is at a specific location on Debian
4
4
 
5
5
---
6
 
 bin/jruby.sh |    3 ++-
7
 
 1 files changed, 2 insertions(+), 1 deletions(-)
 
6
 bin/jruby.sh |    5 +++++
 
7
 1 files changed, 5 insertions(+), 0 deletions(-)
8
8
 
9
9
diff --git a/bin/jruby.sh b/bin/jruby.sh
10
 
index 395da7c..27b0359 100755
 
10
index 395da7c..67fe065 100755
11
11
--- a/bin/jruby.sh
12
12
+++ b/bin/jruby.sh
13
 
@@ -46,6 +46,7 @@ if [ "$JRUBY_HOME_1" = '.' ] ; then
14
 
 else
 
13
@@ -47,6 +47,11 @@ else
15
14
   JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
16
15
 fi
17
 
+JRUBY_HOME=/usr/lib/jruby/
18
16
 
 
17
+# set JRUBY_HOME to /u/l/jruby except for its own build process
 
18
+if [ -z "$BUILDING_JRUBY" ]; then
 
19
+  JRUBY_HOME=/usr/lib/jruby/
 
20
+fi
 
21
+
19
22
 if [ -z "$JRUBY_OPTS" ] ; then
20
23
   JRUBY_OPTS=""
21
 
@@ -288,7 +289,7 @@ fi
22
 
 JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
23
 
 
24
 
 if $cygwin; then
25
 
-  JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
26
 
+  JRUBY_HOME=/usr/lib/jruby/
27
 
   JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
28
 
   
29
 
   if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then
 
24
 fi
30
25
--