merge of '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'

     and '9a0857ebdef17f18989f0702e43595ce522a7a24'

7 files changed, 33 insertions, 14 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index ac73e909f8..1a7ef4f143 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -636,7 +636,7 @@ def oe_unpack_file(file, data, url = None):
 		cmd = 'gzip -dc %s > %s' % (file, efile)
 	elif file.endswith('.bz2'):
 		cmd = 'bzip2 -dc %s > %s' % (file, efile)
-	elif file.endswith('.zip'):
+	elif file.endswith('.zip') or file.endswith('.jar'):
 		cmd = 'unzip -q -o'
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
 		if 'dos' in parm:
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index cc0d11e515..19d431ce72 100644
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ RDEPENDS  += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
 # Determine the staged version of perl from the perl configuration file
 def get_perl_version(d):
 	import os, bb, re
-    	cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d)
+    	cfg = bb.data.expand('${STAGING_DIR_HOST}/perl/config.sh', d)
 	try:
 		f = open(cfg, 'r')
 	except IOError:
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 005e7cc0e9..3ff3f3093d 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -15,7 +15,7 @@ export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}"
 cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+		. ${STAGING_DIR_TARGET}/perl/config.sh
 		if [ "${IS_NEW_PERL}" = "yes" ]; then
 			sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
 				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass
index 63e716c099..c3804ff4cc 100644
--- a/classes/cpan_build.bbclass
+++ b/classes/cpan_build.bbclass
@@ -25,7 +25,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
 cpan_build_do_configure () {
 	if [ ${@is_target(d)} == "yes" ]; then
 		# build for target
-		. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+		. ${STAGING_DIR_TARGET}/perl/config.sh
 		if [ "${IS_NEW_PERL}" = "yes" ]; then
 			perl Build.PL --installdirs vendor \
 				--destdir ${D} \
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index a1e00e72c1..bc0a1dfaba 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -1,3 +1,4 @@
+DEPENDS =+ "gettext-native"
 def gettext_after_parse(d):
     import bb
     # Remove the NLS bits if USE_NLS is no.
@@ -14,3 +15,4 @@ python () {
 
 DEPENDS =+ "gettext-native"
 EXTRA_OECONF += "--enable-nls"
+
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 9e51a0b7b2..620dae79fb 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -70,19 +70,27 @@ oe_jarinstall() {
 
 oe_makeclasspath() {
   # Purpose: Generate a classpath variable from the given Jar file names
-  # where the ".jar" has been omitted.
+  # where the ".jar" has been omitted. The string is stored in the script
+  # variable whose name is given in the first argument to this function.
   #
-  # oe_makeclasspath foo baz bar
-  # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
-  #
-  # oe_makeclasspath -s foo baz bar
-  # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+  # oe_makeclasspath cp foo baz bar
+  # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
+	# in variable "cp".
   #
+  # oe_makeclasspath bootcp -s foo baz bar
+  # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+	# in variable "bootcp".
+	# 
   # Provide the -s at the beginning otherwise strange things happen.
-  #
+	# If -s is given the function checks whether the requested jar file exists
+	#	and exits with an error message if it cannot be found.
+	#
   dir=${datadir_java}
 	classpath=
 	delimiter=
+	retval=$1
+
+	shift
 
   while [ "$#" -gt 0 ]; do
     case "$1" in
@@ -95,18 +103,18 @@ oe_makeclasspath() {
     *)
       file=$dir/$1.jar
 
-			if [ ! -f $file ]; then
+			if [ -z "$dir" -a ! -f $file ]; then
 				oefatal "oe_makeclasspath: Jar file for '$1' not found at $file"
 			fi
 
-      classpath=$classpath$file
+      classpath=$classpath$delimiter$file
       delimiter=":"
       ;;
     esac
     shift
   done
 
-	echo $classpath
+	eval $retval="$classpath"
 }
 
 # Creates a simple wrapper script for your Java program.
diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index a94332b92c..6c66eac7ad 100644
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -2,15 +2,24 @@
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
 
+# Save MULTIMACH_ARCH
+OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
+# Save PACKAGE_ARCH
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
+
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk"
+STAGING_DIR_TARGET = "${STAGING_DIR}/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
+#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}"
 
 CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"