[oe-commits] org.oe.dev merge of '02dd7a3b7bfd0dca79e61d6886ac11d42cb3365f'

Sat Feb 9 03:49:18 UTC 2008

merge of '02dd7a3b7bfd0dca79e61d6886ac11d42cb3365f'
     and 'd64471dd1489ebf7d567b0896f3f41d31aeabe1a'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: f9bcfabb608b4db17ec7d4d2fa1aad64b1612960
ViewMTN: http://monotone.openembedded.org/revision/info/f9bcfabb608b4db17ec7d4d2fa1aad64b1612960
Files:
1
packages/jamvm/files/debian-jni.patch
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/klibc/files/klibc-config-eabi.patch
packages/klibc/klibc-utils-static_1.5.bb
packages/libxml/libxml++_2.14.0.bb
Diffs:

#
# mt diff -r02dd7a3b7bfd0dca79e61d6886ac11d42cb3365f -rf9bcfabb608b4db17ec7d4d2fa1aad64b1612960
#
# 
# 
# add_file "packages/jamvm/files/debian-jni.patch"
#  content [fde8e06ffb742cd42a2d3f9da5e021a1188c7bce]
# 
# patch "packages/cacao/cacao.inc"
#  from [595f9dee8b31829f4c2a1e6565e8b3d7e4522473]
#    to [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
# 
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
#  from [6b579068c4284eea4bb711e240a0e1ff839a8583]
#    to [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
# 
# patch "packages/jamvm/jamvm.inc"
#  from [5edcfc7c22cf4daf00c3d364962aa42af749237e]
#    to [1eb0be17dafb30f822a0fad779c2d82f62088d2a]
# 
# patch "packages/jamvm/jamvm_1.5.0.bb"
#  from [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
#    to [7f3f0abf4aff253a69554613cd74fe49da01168d]
# 
============================================================

--- packages/jamvm/files/debian-jni.patch	fde8e06ffb742cd42a2d3f9da5e021a1188c7bce
+++ packages/jamvm/files/debian-jni.patch	fde8e06ffb742cd42a2d3f9da5e021a1188c7bce
@@ -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
+ }
+ 
============================================================
--- 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 \
============================================================
--- packages/jamvm/jamvm.inc	5edcfc7c22cf4daf00c3d364962aa42af749237e
+++ packages/jamvm/jamvm.inc	1eb0be17dafb30f822a0fad779c2d82f62088d2a
@@ -12,7 +12,7 @@ ARM_INSTRUCTION_SET = "arm"
 # 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"
============================================================
--- packages/jamvm/jamvm_1.5.0.bb	645cab3c8ecedf36901ba0d416cb8956c85f04b1
+++ packages/jamvm/jamvm_1.5.0.bb	7f3f0abf4aff253a69554613cd74fe49da01168d
@@ -1,5 +1,12 @@ require jamvm.inc
 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
+}
+


#
# mt diff -rd64471dd1489ebf7d567b0896f3f41d31aeabe1a -rf9bcfabb608b4db17ec7d4d2fa1aad64b1612960
#
# 
# 
# add_file "packages/klibc/files/klibc-config-eabi.patch"
#  content [9ce82e5d2cc7597ec66f40fd0abe36685b998028]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
#    to [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
# 
# patch "packages/libxml/libxml++_2.14.0.bb"
#  from [187d10dec4db1b74dddc6d4bdbd94e1405d4b1d7]
#    to [e3fd57cf2ced465e6ef806bf639ccfa210bf9810]
# 
============================================================
--- packages/klibc/files/klibc-config-eabi.patch	9ce82e5d2cc7597ec66f40fd0abe36685b998028
+++ packages/klibc/files/klibc-config-eabi.patch	9ce82e5d2cc7597ec66f40fd0abe36685b998028
@@ -0,0 +1,9 @@
+diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
+--- klibc-1.5/defconfig	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5p/defconfig	2008-02-08 19:24:22.337127756 +0100
+@@ -5,4 +5,4 @@
+ CONFIG_REGPARM=y
+ # ARM options
+ # CONFIG_KLIBC_THUMB is not set
+-# CONFIG_AEABI is not set
++CONFIG_AEABI=y
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f
+++ packages/klibc/klibc-utils-static_1.5.bb	0aeaa25067f4778c45bbbd7ec34c5031db9f1f12
@@ -1,9 +1,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 require klibc-common.inc
 
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
 
+SRC_URI_append_linux-gnueabi = "\
+			       	file://klibc-config-eabi.patch;patch=1"
+
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
                 "
@@ -36,7 +39,6 @@ do_install() {
         install -m 755 usr/utils/static/uname ${D}${base_bindir}
 }
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
         klibc-utils-static-cat klibc-utils-static-chroot \
         klibc-utils-static-cpio klibc-utils-static-dd \
@@ -71,11 +73,3 @@ FILES_klibc-utils-static-uname = "${base
 FILES_klibc-utils-static-true = "${base_bindir}/true"
 FILES_klibc-utils-static-umount = "${base_bindir}/umount"
 FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-
-# the klibc code contains ARM instructions (for ARM), this
-# could be fixed, but for the moment:
-ARM_INSTRUCTION_SET = "arm"
-
-KLIBC_ARCH = "'${TARGET_ARCH}'"
-KLIBC_ARCH_armeb = "'arm'"
-KLIBC_ARCH_mipsel = "'mips'"
============================================================
--- packages/libxml/libxml++_2.14.0.bb	187d10dec4db1b74dddc6d4bdbd94e1405d4b1d7
+++ packages/libxml/libxml++_2.14.0.bb	e3fd57cf2ced465e6ef806bf639ccfa210bf9810
@@ -1,6 +1,6 @@ LICENSE = "GPL"
 LICENSE = "GPL"
 
-DEPENDS = "gtk+"
+DEPENDS = "gtk+ glibmm"
 
 inherit gnome pkgconfig
 




