Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev

4 files changed, 27 insertions, 17 deletions

diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 7e26e03104..57ff3672b2 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -12,7 +12,11 @@ FILES_${PN} += "${datadir}/application-registry  \
 	${datadir}/mime-info \
 	${datadir}/mime/packages \	
 	${datadir}/mime/application \
-	${datadir}/gnome-2.0"
+	${datadir}/gnome-2.0 \
+	${datadir}/polkit* \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
 
 inherit autotools gtk-icon-cache pkgconfig gconf mime
 
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index c2e8d9cf1d..c85703eee2 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -263,11 +263,10 @@ def package_qa_check_dev(path, name,d, elf):
         if bb.data.inherits_class(s, d):
             return True
 
-    if not "-dev" in name:
-        if path[-3:] == ".so" and os.path.islink(path):
-            error_msg = "non -dev package contains symlink .so: %s path '%s'" % \
-                     (name, package_qa_clean_path(path,d))
-            sane = package_qa_handle_error(0, error_msg, name, path, d)
+    if not name.endswith("-dev") and path.endswith(".so") and os.path.islink(path):
+        error_msg = "non -dev package contains symlink .so: %s path '%s'" % \
+                 (name, package_qa_clean_path(path,d))
+        sane = package_qa_handle_error(0, error_msg, name, path, d)
 
     return sane
 
@@ -412,7 +411,7 @@ def package_qa_check_staged(path,d):
     for root, dirs, files in os.walk(path):
         for file in files:
             path = os.path.join(root,file)
-            if file[-2:] == "la":
+            if file.endswith(".la"):
                 file_content = open(path).read()
                 # Don't check installed status for native/cross packages
                 if not iscrossnative:
@@ -422,7 +421,7 @@ def package_qa_check_staged(path,d):
                 if workdir in file_content:
                     error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
                     sane = package_qa_handle_error(8, error_msg, "staging", path, d)
-            elif file[-2:] == "pc":
+            elif file.endswith(".pc"):
                 file_content = open(path).read()
                 if pkgconfigcheck in file_content:
                     error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root)
diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index b139411c19..2a935e4685 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -1,8 +1,18 @@
 DEPENDS += "python-scons-native"
 
+export TARGET_LINK_HASH_STYLE
+
 scons_do_compile() {
-        ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} || \
-        oefatal "scons build execution failed."
+    if [ "${SCONS_FIX_ENV}" = "1" ] ; then
+        if grep "toolchain-from-env" ${S}/SConstruct ; then
+            echo "Toolchain overrides already applied"
+        else
+           cat ${STAGING_DATADIR_NATIVE}/scons/toolchain-from-env.SConscript >> ${S}/SConstruct
+        fi
+    fi
+
+    ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} CXX="${CXX}" PREFIX=${prefix} prefix=${prefix} || \
+    oefatal "scons build execution failed."
 }
 
 scons_do_install() {
@@ -11,10 +21,4 @@ scons_do_install() {
         oefatal "scons install execution failed."
 }
 
-scons_do_stage() {
-	install -d ${D}${prefix}
-        ${STAGING_BINDIR_NATIVE}/scons PREFIX=${STAGING_DIR_HOST}/${prefix} prefix=${STAGING_DIR_HOST}/${prefix} install || \
-        oefatal "scons stage execution failed."
-}
-
-EXPORT_FUNCTIONS do_compile do_install do_stage
+EXPORT_FUNCTIONS do_compile do_install
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index 26339058c8..433b64e87e 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -1,3 +1,6 @@
+# Vala has problems with multiple concurrent invocations
+PARALLEL_MAKE = ""
+
 DEPENDS += "vala-native"
 
 FILES_${PN}-dev += "\