Merge remote branch 'upstream/org.openembedded.dev' into org.openembedded.dev

[openembedded.git] / classes / dietlibc.bbclass

diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass
index 7c7b5fe..2676385 100644 (file)
--- a/classes/dietlibc.bbclass
+++ b/classes/dietlibc.bbclass
@@ -4,18 +4,18 @@ def dietlibc_after_parse(d):
     import bb
     # Remove the NLS
     cfg = oe_filter_out('--(dis|en)able-nls', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
-    # Remove shared and static and set it right
-    cfg += " --disable-nls --disbale-shared --enable-static"
+    # Remove shared enable static only
+    cfg += " --disable-nls --disable-shared --enable-static"
     bb.data.setVar('EXTRA_OECONF', cfg, d)
     cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or ""
     cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d)
-    cfgtmp = "\'CC=diet ${CCACHE}"
+    cfgtmp = "\'CC=\"diet ${CCACHE}\""
     cfgtmp += cfg
     bb.data.setVar('EXTRA_OEMAKE', cfgtmp, d)
 
-python () {
-    dietlibc_after_parse(d)
-}
+#python () {
+#    dietlibc_after_parse(d)
+#}
 
 set_dietlibc_env () {
        export CC="diet ${CC}"