From 73a089c563b803abf97c6a4372c458dba5fff1ad Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 22 Jul 2008 06:19:00 +0000 Subject: jamvm-initial 1.4.5: New recipe. --- packages/jamvm/files/jamvm_1.4.5-initial.patch | 73 ++++++++++++++++++++++++++ packages/jamvm/jamvm-initial_1.4.5.bb | 38 ++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 packages/jamvm/files/jamvm_1.4.5-initial.patch create mode 100644 packages/jamvm/jamvm-initial_1.4.5.bb (limited to 'packages') diff --git a/packages/jamvm/files/jamvm_1.4.5-initial.patch b/packages/jamvm/files/jamvm_1.4.5-initial.patch new file mode 100644 index 0000000000..3c68818955 --- /dev/null +++ b/packages/jamvm/files/jamvm_1.4.5-initial.patch @@ -0,0 +1,73 @@ +Index: jamvm-1.4.5/configure.ac +=================================================================== +--- jamvm-1.4.5.orig/configure.ac ++++ jamvm-1.4.5/configure.ac +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/jam.c) +-AM_INIT_AUTOMAKE(jamvm, 1.4.5) ++AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5) + AC_CONFIG_HEADERS([src/config.h]) + AC_PREFIX_DEFAULT(/usr/local/jamvm) + +Index: jamvm-1.4.5/java-initial +=================================================================== +--- /dev/null ++++ jamvm-1.4.5/java-initial +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Wrapper script inspired by the one provided by cacao. ++ ++exec jamvm-initial ${1+"$@"} +Index: jamvm-1.4.5/lib/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/lib/Makefile.am ++++ jamvm-1.4.5/lib/Makefile.am +@@ -1,4 +1,4 @@ +-@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip ++@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip + @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/ + + SUBDIRS = jamvm java gnu sun +Index: jamvm-1.4.5/src/dll.c +=================================================================== +--- jamvm-1.4.5.orig/src/dll.c ++++ jamvm-1.4.5/src/dll.c +@@ -294,7 +294,7 @@ char *getDllPath() { + } + + char *getBootDllPath() { +- return CLASSPATH_INSTALL_DIR"/lib/classpath"; ++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial"; + } + + char *getDllName(char *name) { +Index: jamvm-1.4.5/src/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/src/Makefile.am ++++ jamvm-1.4.5/src/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = os + DIST_SUBDIRS = os arch + + bin_PROGRAMS = jamvm +-include_HEADERS = jni.h ++noinst_HEADERS = jni.h + + lib_LTLIBRARIES = libjvm.la + noinst_LTLIBRARIES = libcore.la +Index: jamvm-1.4.5/src/class.c +=================================================================== +--- jamvm-1.4.5.orig/src/class.c ++++ jamvm-1.4.5/src/class.c +@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) + } + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" +-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" ++#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip" ++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip" + #else + #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" diff --git a/packages/jamvm/jamvm-initial_1.4.5.bb b/packages/jamvm/jamvm-initial_1.4.5.bb new file mode 100644 index 0000000000..c71811dd4e --- /dev/null +++ b/packages/jamvm/jamvm-initial_1.4.5.bb @@ -0,0 +1,38 @@ +SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" + +DEPENDS = "zlib-native classpath-initial jikes-initial" + +PR = "r0" + +PROVIDES = "virtual/java-initial" + +S = "${WORKDIR}/jamvm-${PV}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ + file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \ + " + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit native autotools + +EXTRA_OECONF = "\ + --with-classpath-install-dir=${prefix} \ + --program-suffix=-initial \ + " + +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +do_compile() { + oe_runmake \ + JAVAC=jikes-initial \ + GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip +} + +do_stage_append() { + install -d ${STAGING_BINDIR} + install -m 0755 java-initial ${STAGING_BINDIR} +} -- cgit v1.2.3 From cf91c71446e557ba253d492898d59e5990516f4c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 22 Jul 2008 06:43:10 +0000 Subject: classpath-native.inc: Set JAVAC through environment variable. classpath.inc: Set JAVAC through environment variable. --- packages/classpath/classpath-native.inc | 4 ++++ packages/classpath/classpath.inc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index bb5abaf178..310ca3c3af 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -10,6 +10,10 @@ DEPENDS = "ecj-initial fastjar-native zip-native" inherit autotools native +# Newer versions expect setting the compiler through this +# environment variable. +export JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial + EXTRA_OECONF = "\ --with-glibj \ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \ diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index cfb9f1c089..0ea5d36f33 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -20,9 +20,13 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" +# Newer versions expect setting the compiler through this +# environment variable. +export JAVAC=${STAGING_BINDIR_NATIVE}/javac + EXTRA_OECONF = "\ --with-glibj \ - --with-ecj=javac \ + --with-ecj=${STAGING_BINDIR_NATIVE}/javac \ --with-fastjar=fastjar \ --includedir=${includedir}/classpath \ --with-vm=java \ -- cgit v1.2.3 From a2d91ed512d248d832e385c40db6f31d0886dabe Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Sun, 27 Jul 2008 15:34:08 +0000 Subject: disapproval of revision 'ff3cafe77c935d7b92703d6844722054ef7f9774' --- packages/classpath/classpath-native.inc | 4 ---- packages/classpath/classpath.inc | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index 310ca3c3af..bb5abaf178 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -10,10 +10,6 @@ DEPENDS = "ecj-initial fastjar-native zip-native" inherit autotools native -# Newer versions expect setting the compiler through this -# environment variable. -export JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial - EXTRA_OECONF = "\ --with-glibj \ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \ diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 0ea5d36f33..cfb9f1c089 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -20,13 +20,9 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" -# Newer versions expect setting the compiler through this -# environment variable. -export JAVAC=${STAGING_BINDIR_NATIVE}/javac - EXTRA_OECONF = "\ --with-glibj \ - --with-ecj=${STAGING_BINDIR_NATIVE}/javac \ + --with-ecj=javac \ --with-fastjar=fastjar \ --includedir=${includedir}/classpath \ --with-vm=java \ -- cgit v1.2.3