[oe-commits] org.oe.dev cacao: Use ${libdir_jni} instead of ${libdir}/jni

[thebohemian commit]

cacao: Use ${libdir_jni} instead of ${libdir}/jni

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: d64471dd1489ebf7d567b0896f3f41d31aeabe1a
ViewMTN: http://monotone.openembedded.org/revision/info/d64471dd1489ebf7d567b0896f3f41d31aeabe1a
Files:
1
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
Diffs:

#
# mt diff -rc43938825fe3c6e7a5fe5625efd1a80fa519c60f -rd64471dd1489ebf7d567b0896f3f41d31aeabe1a
#
# 
# 
# patch "packages/cacao/cacao.inc"
#  from [595f9dee8b31829f4c2a1e6565e8b3d7e4522473]
#    to [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
# 
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
#  from [6b579068c4284eea4bb711e240a0e1ff839a8583]
#    to [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
# 
============================================================
--- packages/cacao/cacao.inc	595f9dee8b31829f4c2a1e6565e8b3d7e4522473
+++ packages/cacao/cacao.inc	d1fb162242cfc59d0aecad7027643cdec90b4b4d
@@ -13,7 +13,7 @@ RPROVIDES_cacao = "java2-runtime"
 PROVIDES = "cacao virtual/java"
 RPROVIDES_cacao = "java2-runtime"
 
-inherit autotools update-alternatives
+inherit java autotools update-alternatives
 
 EXTRA_OECONF = "\
 	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
@@ -41,11 +41,11 @@ do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
   # configured in OE.
   if [ -e src/vm/properties.c ]; then
-    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/properties.c
   fi
 
   if [ -e src/vm/properties.c ]; then
-    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/vm.c
   fi
 }
 
============================================================
--- packages/cacao/cacao_0.98+hg20071001.bb	6b579068c4284eea4bb711e240a0e1ff839a8583
+++ packages/cacao/cacao_0.98+hg20071001.bb	ac5e51b47c7d3446078d237ac95abd0fa9c668cc
@@ -1,6 +1,6 @@ require cacao.inc
 require cacao.inc
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "\
         http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \