From 3afce2b55b72176984f9ab383d62a67f5bc5ac71 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 13 Nov 2008 15:47:10 +0100 Subject: classpath-initial 0.93: Added miscompilation patch. --- packages/classpath/classpath-initial_0.93.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/classpath/classpath-initial_0.93.bb') diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb index 5a471b3808..09bcde1b87 100644 --- a/packages/classpath/classpath-initial_0.93.bb +++ b/packages/classpath/classpath-initial_0.93.bb @@ -5,11 +5,14 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -PR = "r4" +PR = "r5" DEPENDS = "zip-native fastjar-native jikes-native gettext-native" -SRC_URI += "file://autotools.patch;patch=1" +SRC_URI += "\ + file://autotools.patch;patch=1 \ + file://miscompilation.patch;patch=1 \ + " EXTRA_OECONF = "\ --with-jikes=jikes \ -- cgit 1.2.3-korg From 4a90826f75410002b731d797d23e1743084120f8 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 13:48:30 +0100 Subject: 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(-) create mode 100644 packages/classpath/files/miscompilation-0.93.patch (limited to 'packages/classpath/classpath-initial_0.93.bb') diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb index 09bcde1b87..c36ea3813d 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 0000000000..99db6f3003 --- /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 */ -- cgit 1.2.3-korg