[oe-commits] Robert Schuster : classpath-initial 0.93: Use a patch that fits to classpath 0.93.

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4a90826f75410002b731d797d23e1743084120f8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a90826f75410002b731d797d23e1743084120f8

Author: Robert Schuster <thebohemian at gmx.net>
Date:   Fri Nov 14 13:48:30 2008 +0100

classpath-initial 0.93: Use a patch that fits to classpath 0.93.

---

 packages/classpath/classpath-initial_0.93.bb       |    4 ++--
 packages/classpath/files/miscompilation-0.93.patch |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb
index 09bcde1..c36ea38 100644
--- a/packages/classpath/classpath-initial_0.93.bb
+++ b/packages/classpath/classpath-initial_0.93.bb
@@ -5,13 +5,13 @@ require classpath-native.inc
 
 DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "zip-native fastjar-native jikes-native gettext-native"
 
 SRC_URI += "\
 	file://autotools.patch;patch=1 \
-	file://miscompilation.patch;patch=1 \
+	file://miscompilation-0.93.patch;patch=1 \
 	"
 
 EXTRA_OECONF = "\
diff --git a/packages/classpath/files/miscompilation-0.93.patch b/packages/classpath/files/miscompilation-0.93.patch
new file mode 100644
index 0000000..99db6f3
--- /dev/null
+++ b/packages/classpath/files/miscompilation-0.93.patch
@@ -0,0 +1,13 @@
+Index: classpath-0.93/native/jni/java-io/java_io_VMFile.c
+===================================================================
+--- classpath-0.93.orig/native/jni/java-io/java_io_VMFile.c	2006-09-23 07:17:45.000000000 +0200
++++ classpath-0.93/native/jni/java-io/java_io_VMFile.c	2008-11-14 13:41:27.000000000 +0100
+@@ -239,7 +239,7 @@
+ {
+ #ifndef WITHOUT_FILESYSTEM
+   const char *filename;
+-  int result;
++  volatile int result;
+ 
+   /* Don't use the JCL convert function because it throws an exception
+      on failure */