diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-14 23:43:33 +0000 |
---|---|---|
committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-14 23:43:33 +0000 |
commit | c3ddec6575892bd802b98db7a608cd4b57ae625b (patch) | |
tree | 42a2cd5a355d8330ebd2c77802d2cc5b028dd77a /packages/classpath | |
parent | 625b6fa7dc58ae4c67891a8805cd5729424c3090 (diff) | |
parent | 4a66c132ce2282f4a14b97d08e3557f855eb7b0e (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/classpath')
-rw-r--r-- | packages/classpath/classpath-initial_0.93.bb | 4 | ||||
-rw-r--r-- | 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 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 */ |