summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-21 10:43:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-22 13:13:46 +0000
commitad73b121e57cbb67e8d638f6299d1ceb9a75a94f (patch)
tree89b3efb77e3f3afc97eaf81cdb53bc029a805026
parentb429ba90e15aa6cb64e9e95fec8f0583f3307710 (diff)
downloadpoky-ad73b121e57cbb67e8d638f6299d1ceb9a75a94f.tar.gz
binutils: fix building on distros with matching binutils version
x86_64 opensuse 11.4 has bintuils version 2.21, and when binutils_2.21 recipe is built for x86_64 target then, the invocation of distro gcc fails with errors like this: /usr/lib64/gcc/x86_64-suse-linux/4.5/../../../../x86_64-suse-linux/bin/as: symbol lookup error: /usr/lib64/gcc/x86_64-suse-linux/4.5/.. make[2]: *** [sysinfo.o] Error 1 The issue rootcaused as incompatible LD_LIBRARY_PATH while running the distro gcc. As per Martin Jansa gentoo also sees similar issue with binutils 2.22 recipe. This commit fixes the issue by clearing the LD_LIBRARY_PATH for distro gcc (CC_FOR_BUILD) This Fixes bug: [YOCTO #1833] (From OE-Core rev: be769d948a9c26d55d98fbf38fc0b109edb40c3f) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb2
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb2
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.22.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
index e91e7dca3f..a49adedad6 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
@@ -1,3 +1,3 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross-canadian.inc 2require binutils-cross-canadian.inc
3PR = "r1" 3PR = "r2"
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
index 21289cd4ec..0e8b6e486f 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
@@ -4,7 +4,7 @@ inherit crosssdk
4 4
5PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 5PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
6 6
7PR = "r1" 7PR = "r2"
8 8
9do_configure_prepend () { 9do_configure_prepend () {
10 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt 10 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 5cb2cc9e87..30a0416105 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -76,7 +76,7 @@ export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
76export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 76export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
77export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 77export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
78 78
79export CC_FOR_BUILD = "${BUILD_CC}" 79export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
80export CPP_FOR_BUILD = "${BUILD_CPP}" 80export CPP_FOR_BUILD = "${BUILD_CPP}"
81export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" 81export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
82 82
diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb
index f1e7e127ba..41a30ee094 100644
--- a/meta/recipes-devtools/binutils/binutils_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.22.bb
@@ -1,6 +1,6 @@
1require binutils.inc 1require binutils.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5LIC_FILES_CHKSUM="\ 5LIC_FILES_CHKSUM="\
6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ 6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\