diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-06-22 22:08:33 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-06-22 22:08:33 +0000 |
| commit | 7032ecd64e209bf267cd3d0bb9397effadc5f4da (patch) | |
| tree | 431fe0d54887b0163ae2abd4b97d1338686774af /dev-java/jruby/files | |
| parent | Don't use built_with_use --missing anymore since all versions of curl in-tree... (diff) | |
| download | gentoo-2-7032ecd64e209bf267cd3d0bb9397effadc5f4da.tar.gz gentoo-2-7032ecd64e209bf267cd3d0bb9397effadc5f4da.tar.bz2 gentoo-2-7032ecd64e209bf267cd3d0bb9397effadc5f4da.zip | |
Fix bindir definition, or rather workaround since the properties don't seem to get respected from the file.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jruby/files')
| -rw-r--r-- | dev-java/jruby/files/jruby-1.5.0-bindir.patch | 12 | ||||
| -rw-r--r-- | dev-java/jruby/files/jruby-1.5.0-system-jars.patch | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/dev-java/jruby/files/jruby-1.5.0-bindir.patch b/dev-java/jruby/files/jruby-1.5.0-bindir.patch deleted file mode 100644 index 88390b223adb..000000000000 --- a/dev-java/jruby/files/jruby-1.5.0-bindir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur jruby-1.5.0.orig/src/org/jruby/libraries/RbConfigLibrary.java jruby-1.5.0/src/org/jruby/libraries/RbConfigLibrary.java ---- jruby-1.5.0.orig/src/org/jruby/libraries/RbConfigLibrary.java 2010-05-16 08:54:49.000000000 +1200 -+++ jruby-1.5.0/src/org/jruby/libraries/RbConfigLibrary.java 2010-05-16 23:24:36.000000000 +1200 -@@ -135,7 +135,7 @@ - // Use property for binDir if available, otherwise fall back to common bin default - String binDir = SafePropertyAccessor.getProperty("jruby.bindir"); - if (binDir == null) { -- binDir = new NormalizedFile(normalizedHome, "bin").getPath(); -+ binDir = new NormalizedFile(normalizedHome, "/usr/bin").getPath(); - } - setConfig(configHash, "bindir", binDir); - diff --git a/dev-java/jruby/files/jruby-1.5.0-system-jars.patch b/dev-java/jruby/files/jruby-1.5.0-system-jars.patch index 294feedbbaf6..8260df1b81b9 100644 --- a/dev-java/jruby/files/jruby-1.5.0-system-jars.patch +++ b/dev-java/jruby/files/jruby-1.5.0-system-jars.patch @@ -176,7 +176,8 @@ diff -Naur jruby-1.5.1.bak/bin/jruby.sh jruby-1.5.1/bin/jruby.sh JAVA_VM=-client ;; @@ -275,51 +202,16 @@ - JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK" +-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK" ++JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK -Djruby.bindir=/usr/bin" -JFFI_BOOT="" -if [ -d $JRUBY_HOME/lib/native/ ]; then |