summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/eglibc/eglibc-initial.inc3
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc4
-rw-r--r--meta/recipes-core/glibc/glibc-initial.inc3
-rw-r--r--meta/recipes-core/glibc/glibc.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb2
7 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index d49ec8a87e..cb50e89226 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -6,6 +6,9 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
6PACKAGES = "" 6PACKAGES = ""
7PACKAGES_DYNAMIC = "" 7PACKAGES_DYNAMIC = ""
8 8
9STAGINGCC = "gcc-cross-initial"
10STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
11
9do_configure () { 12do_configure () {
10 sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure 13 sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
11 chmod +x ${S}/configure 14 chmod +x ${S}/configure
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 4698254932..63c313ca48 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -1,5 +1,9 @@
1require eglibc-common.inc 1require eglibc-common.inc
2 2
3STAGINGCC = "gcc-cross-intermediate"
4STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
5PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
6
3# nptl needs unwind support in gcc, which can't be built without glibc. 7# nptl needs unwind support in gcc, which can't be built without glibc.
4DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" 8DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
5#this leads to circular deps, so lets not add it yet 9#this leads to circular deps, so lets not add it yet
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
index ec10699190..99aa05fab7 100644
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ b/meta/recipes-core/glibc/glibc-initial.inc
@@ -6,6 +6,9 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRN
6PACKAGES = "" 6PACKAGES = ""
7PACKAGES_DYNAMIC = "" 7PACKAGES_DYNAMIC = ""
8 8
9STAGINGCC = "gcc-cross-initial"
10STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
11
9do_configure () { 12do_configure () {
10 sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure 13 sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
11 chmod +x ${S}/configure 14 chmod +x ${S}/configure
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index e2b681f9b2..cdfa06de90 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -17,6 +17,10 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
17PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 17PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
18PROVIDES += "virtual/libintl virtual/libiconv" 18PROVIDES += "virtual/libintl virtual/libiconv"
19 19
20STAGINGCC = "gcc-cross-intermediate"
21STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
22PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
23
20inherit autotools 24inherit autotools
21 25
22GLIBC_EXTRA_OECONF ?= "" 26GLIBC_EXTRA_OECONF ?= ""
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index f582de9843..4e2e343936 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -2,6 +2,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" 2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
3PACKAGES = "" 3PACKAGES = ""
4 4
5CROSS_TARGET_SYS_DIR_append = ".${PN}"
6
5# This is intended to be a -very- basic config 7# This is intended to be a -very- basic config
6# sysroot is needed in case we use libc-initial 8# sysroot is needed in case we use libc-initial
7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 9EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
index 081b7d60fb..28ac1abe18 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
@@ -1,5 +1,5 @@
1require gcc-cross_${PV}.bb 1require gcc-cross_${PV}.bb
2require gcc-cross-initial.inc 2require gcc-cross-initial.inc
3 3
4PR = "r4" 4PR = "r5"
5 5
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
index 5daa31b888..b42de471da 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
@@ -1,3 +1,3 @@
1require gcc-cross-initial_${PV}.bb 1require gcc-cross-initial_${PV}.bb
2require gcc-crosssdk-initial.inc 2require gcc-crosssdk-initial.inc
3PR = "r5" 3PR = "r6"