From 63494d638b7a9b88a5b7d7a02d2afcb3aa0fa064 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Fri, 23 Sep 2011 23:46:38 +0400 Subject: gcc: fix possible problems with nscd compilation during eglibc-nativesdk build Long time ago a066e7ca90a28d5681c5fa895a29e999ed7c88b was committed to address possible problems with compilation of nscd during eglibc-nativesdk build. Problems were related to the way gcc searches for headers to check if it should enable it's own stack smash protection bits or it can relay on eglibc for it. However after 934d38530c9a67562e53d4034aee5531f0f26750 things got broken, as for gcc-crosssdk-intermediate packages: 1) EXTRA_OECONF is ignored 2) headers are installed in a different location than expected by that patch. This results in eglibc-nativesdk build broken on some systems (e.g. mine Debian x86_64 squeeze). Fix that by providing with-headers options to crosssdk-intermediate gcc configuration. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc b/meta/recipes-devtools/gcc/gcc-4.5.1.inc index 90824bdf78..6a9a7a6c3b 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r10" +PR = "r11" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native" diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index ee42fa74e5..5d83e90a3c 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r11" +PR = "r12" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc index ed5d5e838d..8f20d20156 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc @@ -7,3 +7,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} " -- cgit v1.2.3