disapproval of revision 'a846a4c23e94c3e771fd7aaf448e8bb4e11f4506'

3 files changed, 35 insertions, 35 deletions

diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.1.bb
deleted file mode 100644
index a503c7d3d4..0000000000
--- a/packages/cacao/cacao-native_0.99.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require cacao.inc
-
-PR = "r0"
-
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
-           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
-          "
-
-# Quirks for Nokia N800:
-# - with mfloat-abi=softfp the runtime fails to run anything
-# - without --enable-softfloat it cannot find files within Jars
-TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
-
-EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
diff --git a/packages/cacao/cacao_0.99.1.bb b/packages/cacao/cacao_0.99.1.bb
index 217e948831..a503c7d3d4 100644
--- a/packages/cacao/cacao_0.99.1.bb
+++ b/packages/cacao/cacao_0.99.1.bb
@@ -1,6 +1,14 @@
-require cacao-native.inc
+require cacao.inc
 
 PR = "r0"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
           "
+
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
diff --git a/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
index 7c649c495c..7df1c480ea 100644
--- a/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
+++ b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
@@ -1,26 +1,36 @@
+Index: cacao/configure.ac
+===================================================================
+--- cacao.orig/configure.ac	2008-06-27 01:23:44.000000000 +0200
++++ cacao/configure.ac	2008-06-27 01:24:02.000000000 +0200
+@@ -772,6 +772,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+ 
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
 Index: cacao/m4/java-runtime-library.m4
 ===================================================================
---- cacao.orig/m4/java-runtime-library.m4	2008-06-27 13:51:34.000000000 +0200
-+++ cacao/m4/java-runtime-library.m4	2008-06-27 13:53:31.000000000 +0200
-@@ -92,14 +92,28 @@
- AC_MSG_RESULT(${JAVA_RUNTIME_LIBRARY_CLASSES})
+--- cacao.orig/m4/java-runtime-library.m4	2008-06-27 01:23:44.000000000 +0200
++++ cacao/m4/java-runtime-library.m4	2008-06-27 01:24:02.000000000 +0200
+@@ -93,20 +93,32 @@
  AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
  AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
-+])
-+
-+
+ 
 +dnl where are Java core library classes located at compilation time
 +
 +AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
 +AC_MSG_CHECKING(where Java core library classes are located at compile time)
 +AC_ARG_WITH([build-java-runtime-library-classes],
-+            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_CLASSES}]])],
++            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
 +            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
-+            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_CLASSES}])
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
 +AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
 +AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
 +AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
- 
++])
++
  dnl define BOOTCLASSPATH for Makefiles
  case "${WITH_JAVA_RUNTIME_LIBRARY}" in
      cldc1.1 | gnuclasspath)
@@ -33,15 +43,11 @@ Index: cacao/m4/java-runtime-library.m4
          ;;
  esac
  AC_SUBST(BOOTCLASSPATH)
-Index: cacao/configure.ac
-===================================================================
---- cacao.orig/configure.ac	2008-06-27 13:51:34.000000000 +0200
-+++ cacao/configure.ac	2008-06-27 13:53:31.000000000 +0200
-@@ -772,6 +772,7 @@
+ ])
  
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
-+AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+-
+-dnl where are Java runtime library native libraries installed
++dnl where are Java runtime library native libraries installed (at compilation time)
  
- if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
-    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+ AC_MSG_CHECKING(where Java runtime library native libraries are installed)