[oe-commits] org.oe.dev merge of '0b9c7a1af10fa25303941c4460dcc1743e6b58af'

[thebohemian commit]

merge of '0b9c7a1af10fa25303941c4460dcc1743e6b58af'
     and '7a40ab5c6b67885c69046e7758d912d768cd392b'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 72e0f8e82cb9baa16d65f35517d48e96a34a0bf7
ViewMTN: http://monotone.openembedded.org/revision/info/72e0f8e82cb9baa16d65f35517d48e96a34a0bf7
Files:
1
classes/java.bbclass
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 -r0b9c7a1af10fa25303941c4460dcc1743e6b58af -r72e0f8e82cb9baa16d65f35517d48e96a34a0bf7
#
# 
# 
# patch "classes/java.bbclass"
#  from [4c1064a0c1677fa3f136bebf5736ace413a11f30]
#    to [4a470d4978ae2ef918625aa0f94f81ced60914df]
# 
============================================================
--- classes/java.bbclass	4c1064a0c1677fa3f136bebf5736ace413a11f30
+++ classes/java.bbclass	4a470d4978ae2ef918625aa0f94f81ced60914df
@@ -60,3 +60,63 @@ oe_jarinstall() {
     shift
   done
 }
+
+# Creates a simple wrapper script for your Java program.
+# The script is written to ${PN} by default. 
+#
+# Parameters are as follows:
+# [options] <output file> <main class> [jar files ...]
+#
+# Options are
+# -o <name> where name is the output file name
+#
+# It can only take jar files from ${datadir_java}!
+oe_java_simple_wrapper() {
+  delimiter=
+  mainclass=
+  classpath=
+  output=${PN}
+
+  while [ "$#" -gt 0 ]; do
+    case "$1" in
+    -o)
+      shift
+      output=$1
+      ;;
+    -*)
+      oefatal "oe_java_simple_wrapper: unknown option: $1"
+      ;;
+    *)
+      if [ $mainclass ]
+      then
+        classpath=$classpath$delimiter${datadir_java}/$1
+        delimiter=":"
+      else
+        mainclass=$1
+      fi
+      ;;
+    esac
+    shift
+  done
+
+  oenote "Creating simple Java wrapper script"
+  oenote "Output File: $output"
+  oenote "Main Class: $mainclass"
+  oenote "Classpath: $classpath"
+
+  echo "#!/bin/sh" > $output
+  echo "# This file is autogenerated by the oe_java_simple_wrapper function of OpenEmbedded" >> $output
+  echo >> $output
+  echo "# You can provide additional VM arguments by setting the VMARGS environment variable." >> $output
+  echo "CLASSPATH_ARG=\"-cp $classpath\"" >> $output
+  echo >> $output
+  echo "MAIN_CLASS=$mainclass" >> $output
+  echo >> $output
+  echo "# Allows overriding the VM by setting the JAVA environment variable." >> $output
+  echo "if [ x\${JAVA} = x ]" >> $output
+  echo "then" >> $output
+  echo "  JAVA=java" >> $output
+  echo "fi" >> $output
+  echo >> $output
+  echo "exec \${JAVA} \${VMARGS} \${CLASSPATH_ARG} \${MAIN_CLASS} \${@}" >> $output
+}


#
# mt diff -r7a40ab5c6b67885c69046e7758d912d768cd392b -r72e0f8e82cb9baa16d65f35517d48e96a34a0bf7
#
# 
# 
# 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