diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-02-09 03:16:57 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-02-09 03:16:57 +0000 |
| commit | d1fcf02e4749d587d01364564fb75fabd4e8fd1f (patch) | |
| tree | b0845773d81491449de04a33ef0cfa02090c679d /packages | |
| parent | d19a46e55cd98c676c46929d34912a016e31ed4c (diff) | |
| parent | 30b74026cb0873872a709f1b35e1eecd6cec0c50 (diff) | |
merge of '02dd7a3b7bfd0dca79e61d6886ac11d42cb3365f'
and 'd64471dd1489ebf7d567b0896f3f41d31aeabe1a'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/cacao/cacao.inc | 6 | ||||
| -rw-r--r-- | packages/cacao/cacao_0.98+hg20071001.bb | 2 | ||||
| -rw-r--r-- | packages/jamvm/files/debian-jni.patch | 19 | ||||
| -rw-r--r-- | packages/jamvm/jamvm.inc | 2 | ||||
| -rw-r--r-- | packages/jamvm/jamvm_1.5.0.bb | 9 |
5 files changed, 32 insertions, 6 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 \ diff --git a/packages/jamvm/files/debian-jni.patch b/packages/jamvm/files/debian-jni.patch new file mode 100644 index 0000000000..040163da69 --- /dev/null +++ b/packages/jamvm/files/debian-jni.patch @@ -0,0 +1,19 @@ +--- src/dll.c.orig 2004-09-09 15:48:45.000000000 +0000 ++++ src/dll.c 2004-09-09 15:50:32.000000000 +0000 +@@ -189,6 +189,16 @@ + #ifndef NO_JNI + /* Init hash table, and create lock */ + initHashTable(hash_table, HASHTABSZE, TRUE); ++ ++ /* XXX: Add Debian JNI directory. */ ++ char* path = getenv("LD_LIBRARY_PATH"); ++ ++ if (path != NULL) ++ path = strcat(path, ":OE_LIBDIR_JNI"); ++ else ++ path = "OE_LIBDIR_JNI"; ++ ++ setenv("LD_LIBRARY_PATH", path, 1); + #endif + } + diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc index 36378370c5..930159e891 100644 --- a/packages/jamvm/jamvm.inc +++ b/packages/jamvm/jamvm.inc @@ -12,7 +12,7 @@ RPROVIDES_jamvm = "java2-runtime" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -inherit autotools update-alternatives +inherit java autotools update-alternatives EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb index efa959f0f9..366658dd97 100644 --- a/packages/jamvm/jamvm_1.5.0.bb +++ b/packages/jamvm/jamvm_1.5.0.bb @@ -1,5 +1,12 @@ require jamvm.inc -PR = "r0" +SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" +PR = "r1" + +do_configure_prepend() { + # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory + # configured in OE. + sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c +} |