diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-02-09 03:16:38 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-02-09 03:16:38 +0000 |
| commit | 30b74026cb0873872a709f1b35e1eecd6cec0c50 (patch) | |
| tree | b9c14d0faabca38156b880ad126977e2e4b8c248 /packages | |
| parent | d444ca375061d1fa88566455932c0644715c6fa4 (diff) | |
cacao: Use ${libdir_jni} instead of ${libdir}/jni
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/cacao/cacao.inc | 6 | ||||
| -rw-r--r-- | packages/cacao/cacao_0.98+hg20071001.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 09fc741579..0d2b4c7ae1 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -13,7 +13,7 @@ RDEPENDS = "classpath" 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 } diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb index 94919ad24a..878827c28e 100644 --- a/packages/cacao/cacao_0.98+hg20071001.bb +++ b/packages/cacao/cacao_0.98+hg20071001.bb @@ -1,6 +1,6 @@ require cacao.inc -PR = "r7" +PR = "r8" SRC_URI = "\ http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \ |