From 3045ab9b3efc887700a922d06a6f5f4069a41356 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Jul 2012 22:36:44 -0700 Subject: eglibc-initial: Fix build failure due to missing limits.h We have had these things in place to overcome a limitation from our gcc-initial-cross not staging a self sufficient limits.h. Now thats fixed we do reset TOOLCHAIN_OPTIONS to point to sysroot where linux kernel headers are staged and not the bootstrap sysroot which will infact be popuated by eglibc-initial itself. Secondly we dont need to set CPPFLAGS specially as we are doing that in eglibc.inc so we override that Signed-off-by: Khem Raj Signed-off-by: Saul Wold --- meta/recipes-core/eglibc/eglibc-initial.inc | 1 + meta/recipes-core/eglibc/eglibc-initial_2.16.bb | 9 ++++++--- meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'meta/recipes-core/eglibc') diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index 906251633b..1020e402d3 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc @@ -8,6 +8,7 @@ PACKAGES_DYNAMIC = "" STAGINGCC = "gcc-cross-initial" STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" do_configure () { sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb b/meta/recipes-core/eglibc/eglibc-initial_2.16.bb index 787c762609..f6b09ac987 100644 --- a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc-initial_2.16.bb @@ -1,6 +1,9 @@ require eglibc_${PV}.bb require eglibc-initial.inc -do_configure_prepend () { - unset CFLAGS -} +# main eglibc recipes muck with TARGET_CPPFLAGS to point into +# final target sysroot but we +# are not there when building eglibc-initial +# so reset it here + +TARGET_CPPFLAGS = "" diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index b76d94320e..fc3d82bd8c 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "19383" DEPENDS += "gperf-native" -PR = "r1" +PR = "r2" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_16" -- cgit 1.2.3-korg