From 12936a0f3e9c4eee380107f11e87489b35b1504d Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 10 Jan 2013 18:52:49 +0100
Subject: classpath-initial: fix bitbake files searchpath

---
 .../classpath/classpath-0.93/autotools.patch       | 24 ++++++++++++++++++++++
 .../classpath/classpath-0.93/miscompilation.patch  | 13 ++++++++++++
 .../classpath-initial-0.93/autotools.patch         | 24 ----------------------
 .../classpath-initial-0.93/miscompilation.patch    | 13 ------------
 4 files changed, 37 insertions(+), 37 deletions(-)
 create mode 100644 recipes-core/classpath/classpath-0.93/autotools.patch
 create mode 100644 recipes-core/classpath/classpath-0.93/miscompilation.patch
 delete mode 100644 recipes-core/classpath/classpath-initial-0.93/autotools.patch
 delete mode 100644 recipes-core/classpath/classpath-initial-0.93/miscompilation.patch

(limited to 'recipes-core/classpath')

diff --git a/recipes-core/classpath/classpath-0.93/autotools.patch b/recipes-core/classpath/classpath-0.93/autotools.patch
new file mode 100644
index 0000000..663c034
--- /dev/null
+++ b/recipes-core/classpath/classpath-0.93/autotools.patch
@@ -0,0 +1,24 @@
+Index: classpath-0.93/configure.ac
+===================================================================
+--- classpath-0.93.orig/configure.ac	2006-12-08 20:22:50.000000000 +0100
++++ classpath-0.93/configure.ac	2008-08-25 22:07:40.711946598 +0200
+@@ -41,6 +41,11 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
++
++AM_ICONV_LINK
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+@@ -312,6 +317,7 @@
+ dnl AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_CPP
++AM_PROG_CC_C_O
+ 
+ # Handle -Werror default case.
+ if test "$ENABLE_WERROR" = default; then
diff --git a/recipes-core/classpath/classpath-0.93/miscompilation.patch b/recipes-core/classpath/classpath-0.93/miscompilation.patch
new file mode 100644
index 0000000..99db6f3
--- /dev/null
+++ b/recipes-core/classpath/classpath-0.93/miscompilation.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 */
diff --git a/recipes-core/classpath/classpath-initial-0.93/autotools.patch b/recipes-core/classpath/classpath-initial-0.93/autotools.patch
deleted file mode 100644
index 663c034..0000000
--- a/recipes-core/classpath/classpath-initial-0.93/autotools.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: classpath-0.93/configure.ac
-===================================================================
---- classpath-0.93.orig/configure.ac	2006-12-08 20:22:50.000000000 +0100
-+++ classpath-0.93/configure.ac	2008-08-25 22:07:40.711946598 +0200
-@@ -41,6 +41,11 @@
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local/classpath)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
-+
-+AM_ICONV_LINK
-+
- dnl -----------------------------------------------------------
- dnl Enable collections.jar (disabled by default)
- dnl -----------------------------------------------------------
-@@ -312,6 +317,7 @@
- dnl AC_PROG_AWK
- AC_PROG_CC
- AC_PROG_CPP
-+AM_PROG_CC_C_O
- 
- # Handle -Werror default case.
- if test "$ENABLE_WERROR" = default; then
diff --git a/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch b/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch
deleted file mode 100644
index 99db6f3..0000000
--- a/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 v1.2.3-54-g00ecf