From 34729e4f828f2c9efc415838098d4e5dedd456ee Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 18 Jan 2011 12:50:39 +0800 Subject: gcc-cross-initial, gcc-crosssdk-initial: change CROSS_TARGET_SYS_DIR and insall into new locations Signed-off-by: Dexuan Cui --- meta/recipes-core/eglibc/eglibc-initial.inc | 3 +++ meta/recipes-core/eglibc/eglibc.inc | 4 ++++ meta/recipes-core/glibc/glibc-initial.inc | 3 +++ meta/recipes-core/glibc/glibc.inc | 4 ++++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 2 ++ meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb | 2 +- meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb | 2 +- 7 files changed, 18 insertions(+), 2 deletions(-) (limited to 'meta') 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" PACKAGES = "" PACKAGES_DYNAMIC = "" +STAGINGCC = "gcc-cross-initial" +STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" + do_configure () { sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure 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 @@ require eglibc-common.inc +STAGINGCC = "gcc-cross-intermediate" +STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #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 PACKAGES = "" PACKAGES_DYNAMIC = "" +STAGINGCC = "gcc-cross-initial" +STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" + do_configure () { sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure 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" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" +STAGINGCC = "gcc-cross-intermediate" +STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + inherit autotools GLIBC_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}" PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" PACKAGES = "" +CROSS_TARGET_SYS_DIR_append = ".${PN}" + # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial EXTRA_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 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -PR = "r4" +PR = "r5" 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 @@ require gcc-cross-initial_${PV}.bb require gcc-crosssdk-initial.inc -PR = "r5" +PR = "r6" -- cgit v1.2.3-54-g00ecf