summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/nativesdk.bbclass2
-rw-r--r--meta/conf/distro/include/poky-default.inc1
4 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 51a514570b..4e8ae127a7 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -28,7 +28,7 @@ def base_dep_prepend(d):
28 if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): 28 if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
29 if (bb.data.getVar('HOST_SYS', d, 1) != 29 if (bb.data.getVar('HOST_SYS', d, 1) !=
30 bb.data.getVar('BUILD_SYS', d, 1)): 30 bb.data.getVar('BUILD_SYS', d, 1)):
31 deps += " virtual/${TARGET_PREFIX}gcc virtual/libc " 31 deps += " virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc "
32 return deps 32 return deps
33 33
34 34
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 913d88de64..d8cc679283 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -500,7 +500,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
500 if "configure.in" in files: 500 if "configure.in" in files:
501 configs.append(os.path.join(root, "configure.in")) 501 configs.append(os.path.join(root, "configure.in"))
502 502
503 if "gettext" not in bb.data.getVar('P', d, True): 503 if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True):
504 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d): 504 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
505 gt = "gettext-native" 505 gt = "gettext-native"
506 elif bb.data.inherits_class('cross-canadian', d): 506 elif bb.data.inherits_class('cross-canadian', d):
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 75f5790121..95ffc064af 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -62,7 +62,7 @@ python __anonymous () {
62 for dep in deps: 62 for dep in deps:
63 if dep.endswith("-native") or dep.endswith("-cross"): 63 if dep.endswith("-native") or dep.endswith("-cross"):
64 newdeps.append(dep) 64 newdeps.append(dep)
65 elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc"): 65 elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc") or dep.endswith("-g++"):
66 newdeps.append(dep + "-crosssdk") 66 newdeps.append(dep + "-crosssdk")
67 elif not dep.endswith("-nativesdk"): 67 elif not dep.endswith("-nativesdk"):
68 newdeps.append(dep + "-nativesdk") 68 newdeps.append(dep + "-nativesdk")
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index f5882a278c..e0d42c6823 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" 10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" 11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
13 14
14GCCVERSION ?= "4.3.3" 15GCCVERSION ?= "4.3.3"
15BINUVERSION ?= "2.20" 16BINUVERSION ?= "2.20"