[oe-commits] org.oe.dev cacao-native.inc: Fix setting include dir.

[thebohemian commit]

cacao-native.inc: Fix setting include dir.

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: d16b0517d2a99b6918f63d64afde81d944ff6b3a
ViewMTN: http://monotone.openembedded.org/revision/info/d16b0517d2a99b6918f63d64afde81d944ff6b3a
Files:
1
packages/cacao/cacao-native.inc
Diffs:

#
# mt diff -reed451c4cd11b8c1ae78d10335cb3008252bf94a -rd16b0517d2a99b6918f63d64afde81d944ff6b3a
#
#
#
# patch "packages/cacao/cacao-native.inc"
#  from [32a14daad8bfa543857bf859355a62c3f31fb623]
#    to [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
#
============================================================
--- packages/cacao/cacao-native.inc	32a14daad8bfa543857bf859355a62c3f31fb623
+++ packages/cacao/cacao-native.inc	07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc
@@ -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