SOURCES: kaffe-dyn_ltdl.patch, kaffe-jredir.patch - updated for 1.1.7

[qboosh]

Author: qboosh                       Date: Tue Dec 26 14:45:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.1.7

---- Files affected:
SOURCES:
   kaffe-dyn_ltdl.patch (1.3 -> 1.4) , kaffe-jredir.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/kaffe-dyn_ltdl.patch
diff -u SOURCES/kaffe-dyn_ltdl.patch:1.3 SOURCES/kaffe-dyn_ltdl.patch:1.4
--- SOURCES/kaffe-dyn_ltdl.patch:1.3	Sat Oct 22 03:20:45 2005
+++ SOURCES/kaffe-dyn_ltdl.patch	Tue Dec 26 15:45:38 2006
@@ -1,15 +1,14 @@
-diff -Nur kaffe-1.1.5.orig/Makefile.am kaffe-1.1.5/Makefile.am
---- kaffe-1.1.5.orig/Makefile.am	2005-04-08 18:16:09.000000000 +0000
-+++ kaffe-1.1.5/Makefile.am	2005-04-08 18:17:44.000000000 +0000
-@@ -25,7 +25,6 @@
- 	. \
+--- kaffe-1.1.7/Makefile.am.orig	2006-03-26 04:59:06.000000000 +0200
++++ kaffe-1.1.7/Makefile.am	2006-04-23 23:05:19.616891750 +0200
+@@ -20,7 +20,6 @@
+ 	external \
  	libraries/javalib \
  	config \
 -	libltdl \
- 	$(MAYBE_BINRELOC_DIR) \
  	kaffe/kaffeh \
  	include  \
-@@ -241,7 +240,6 @@
+ 	kaffe/kaffevm \
+@@ -211,7 +210,6 @@
  	config \
  	include \
  	replace \

================================================================
Index: SOURCES/kaffe-jredir.patch
diff -u SOURCES/kaffe-jredir.patch:1.3 SOURCES/kaffe-jredir.patch:1.4
--- SOURCES/kaffe-jredir.patch:1.3	Sun Apr 10 17:48:09 2005
+++ SOURCES/kaffe-jredir.patch	Tue Dec 26 15:45:38 2006
@@ -16,33 +16,11 @@
  AC_SUBST(jredir)
  
  jrebindir=$jredir/bin
---- kaffe-1.1.5/kaffe/scripts/kaffe.in.orig	2005-04-09 12:29:29.000000000 +0000
-+++ kaffe-1.1.5/kaffe/scripts/kaffe.in	2005-04-09 12:29:36.000000000 +0000
-@@ -55,7 +55,7 @@
- fi
- 
- if test x"${KAFFEHOME+set}"x != x"set"x; then
--  KAFFEHOME="@prefix@"
-+  KAFFEHOME="@jredir@"
- fi
- export KAFFEHOME
- 
---- kaffe-1.1.5/kaffe/scripts/compat/javac.in.orig	2005-04-10 13:33:59.000000000 +0200
-+++ kaffe-1.1.5/kaffe/scripts/compat/javac.in	2005-04-10 13:34:11.000000000 +0200
+--- kaffe-1.1.7/kaffe/scripts/compat/javac.in.orig	2005-04-10 13:33:59.000000000 +0200
++++ kaffe-1.1.7/kaffe/scripts/compat/javac.in	2005-04-10 13:34:11.000000000 +0200
 @@ -1,4 +1,4 @@
  #! /bin/sh
  # We use the jikes compiler detected by configure
-- at JIKESPROG@ -bootclasspath  @prefix@/jre/lib/rt.jar ${1+"$@"}
-+ at JIKESPROG@ -bootclasspath  @jredir@/lib/rt.jar ${1+"$@"}
+- at JIKESPROG@ -bootclasspath  @prefix@/jre/lib/glibj.zip ${1+"$@"}
++ at JIKESPROG@ -bootclasspath  @jredir@/lib/glibj.zip ${1+"$@"}
  exit $?
---- kaffe-1.1.5/libraries/javalib/gnu/classpath/VMSystemProperties.java.orig	2005-04-10 15:31:20.000000000 +0000
-+++ kaffe-1.1.5/libraries/javalib/gnu/classpath/VMSystemProperties.java	2005-04-10 15:31:31.000000000 +0000
-@@ -200,7 +200,7 @@
-       // Set base URL if not already set.
-       if (properties.get("gnu.classpath.home.url") == null)
- 	properties.put("gnu.classpath.home.url",
--		       "file://" + properties.get("gnu.classpath.home") + "/jre/lib");
-+		       "file://" + properties.get("gnu.classpath.home") + "/lib");
-     }
- 
-     /**
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kaffe-dyn_ltdl.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/kaffe-jredir.patch?r1=1.3&r2=1.4&f=u