diff options
| -rw-r--r-- | packages/cacao/cacao-native.inc | 11 | ||||
| -rw-r--r-- | packages/classpath/classpath-native_0.97.2.bb | 13 | ||||
| -rw-r--r-- | packages/jamvm/jamvm-initial_1.5.0.bb | 4 |
3 files changed, 23 insertions, 5 deletions
diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc index 8ae2874253..f4eee16cf6 100644 --- a/packages/cacao/cacao-native.inc +++ b/packages/cacao/cacao-native.inc @@ -17,7 +17,7 @@ EXTRA_OECONF = "\ --with-vm-zip=${datadir}/cacao/vm.zip \ \ --with-classpath-libdir=${libdir_jni}:${libdir} \ - --with-classpath-includedir=${includedir}/classpath \ + --with-classpath-includedir=${incdir}/classpath \ --with-classpath-classes=${datadir}/classpath/glibj.zip \ \ --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ @@ -26,8 +26,11 @@ EXTRA_OECONF = "\ --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" +# force usage of ecj-initial +# Important: Not specifying the bootclasspath argument here is only supported +# for Cacao >= 0.99. Earlier Cacao may need the BCP set to a Java5-capable +# class library. +export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" # force usage of fastjar -export JAR=fastjar +export JAR="fastjar" diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb new file mode 100644 index 0000000000..e744b3378e --- /dev/null +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -0,0 +1,13 @@ +require classpath-native.inc + +PR = "r0" + +# The code affected by the javanet-local patch +# is usually not compiled. However if someone changes +# to --enable-local-sockets it will. +SRC_URI += "\ + file://netif_16.patch;patch=1;pnum=0 \ + file://SimpleName.diff;patch=1;pnum=0 \ + file://javanet-local.patch;patch=1;pnum=0 \ + " + diff --git a/packages/jamvm/jamvm-initial_1.5.0.bb b/packages/jamvm/jamvm-initial_1.5.0.bb index 3369733340..a1c415dd62 100644 --- a/packages/jamvm/jamvm-initial_1.5.0.bb +++ b/packages/jamvm/jamvm-initial_1.5.0.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "zlib-native classpath-initial jikes-initial" +PR = "r1" + PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" @@ -18,7 +20,7 @@ ARM_INSTRUCTION_SET = "arm" inherit native autotools EXTRA_OECONF = "\ - --with-classpath-install-dir=${STAGING_DIR_NATIVE}\ + --with-classpath-install-dir=${prefix} \ --program-suffix=-initial \ " |