From 5e7a95307b8c10f67b2103557f128014853eb805 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 27 Jun 2008 13:00:39 +0000 Subject: cacao-native 0.99.1: New recipe. --- packages/cacao/cacao-native_0.99.1.bb | 14 +++++++ packages/cacao/cacao_0.99.1.bb | 10 +---- ...080519-build-java-runtime-library-classes.patch | 46 ++++++++++------------ 3 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 packages/cacao/cacao-native_0.99.1.bb diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.1.bb new file mode 100644 index 0000000000..a503c7d3d4 --- /dev/null +++ b/packages/cacao/cacao-native_0.99.1.bb @@ -0,0 +1,14 @@ +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 a503c7d3d4..217e948831 100644 --- a/packages/cacao/cacao_0.99.1.bb +++ b/packages/cacao/cacao_0.99.1.bb @@ -1,14 +1,6 @@ -require cacao.inc +require cacao-native.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 7df1c480ea..7c649c495c 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,36 +1,26 @@ -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 01:23:44.000000000 +0200 -+++ cacao/m4/java-runtime-library.m4 2008-06-27 01:24:02.000000000 +0200 -@@ -93,20 +93,32 @@ +--- 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}) 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 to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])], ++ [AS_HELP_STRING(--with-build-java-runtime-library-classes=,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_CLASSES}]])], + [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}], -+ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]) ++ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_CLASSES}]) +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) @@ -43,11 +33,15 @@ 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 @@ -- --dnl where are Java runtime library native libraries installed -+dnl where are Java runtime library native libraries installed (at compilation time) + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES ++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES - AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[ - AC_MSG_CHECKING(where Java runtime library native libraries are installed) + if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR -- cgit v1.2.3 From ffe04fd5191aeb214933e1a5f6e5c57d5ec9e728 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 27 Jun 2008 13:21:58 +0000 Subject: disapproval of revision 'a846a4c23e94c3e771fd7aaf448e8bb4e11f4506' --- packages/cacao/cacao-native_0.99.1.bb | 14 ------- packages/cacao/cacao_0.99.1.bb | 10 ++++- ...080519-build-java-runtime-library-classes.patch | 46 ++++++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 packages/cacao/cacao-native_0.99.1.bb 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 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 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) -- cgit v1.2.3 From dfc402f596ca3285ac0fb187a954d3f616ab1879 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 27 Jun 2008 13:26:14 +0000 Subject: cacao-native 0.99.1: New recipe. * add support for new configure options in cacao-native.inc --- packages/cacao/cacao-native.inc | 18 ++++++++++++------ packages/cacao/cacao-native_0.99.1.bb | 7 +++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 packages/cacao/cacao-native_0.99.1.bb diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc index 26d3d37f58..8ae2874253 100644 --- a/packages/cacao/cacao-native.inc +++ b/packages/cacao/cacao-native.inc @@ -13,12 +13,18 @@ S = "${WORKDIR}/cacao-${PV}" inherit native autotools EXTRA_OECONF = "\ - --enable-debug \ - --with-classpath-libdir=${libdir} \ - --with-classpath-includedir=${includedir}/classpath \ - --with-classpath-classes=${datadir}/classpath/glibj.zip \ - --with-vm-zip=${datadir}/cacao/vm.zip \ - " + --enable-debug \ + --with-vm-zip=${datadir}/cacao/vm.zip \ + \ + --with-classpath-libdir=${libdir_jni}:${libdir} \ + --with-classpath-includedir=${includedir}/classpath \ + --with-classpath-classes=${datadir}/classpath/glibj.zip \ + \ + --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ + --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ + --with-jni_md_h=${incdir}/classpath \ + --with-jni_h=${incdir}/classpath \ + " # force usage of ecj-initial (but Java5-compatible class library) export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip" diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.1.bb new file mode 100644 index 0000000000..1cf0cb70cf --- /dev/null +++ b/packages/cacao/cacao-native_0.99.1.bb @@ -0,0 +1,7 @@ +require cacao-native.inc + +PR = "r0" + +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \ + " + -- cgit v1.2.3