gcc: take out libiberty files from gcc packages

this Fixes [BUGID #754]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
index b2c257d9d40e4e731f5655b672ef4fe41c650dde..38e0964fedc8b8c50ad63849863e8ff216edea44 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
@@ -1,5 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-PR = "r2"
+PR = "r3"
 

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 2e5283d6914c43666f48580c6e5e0557f63a73ed..92c3ce20594df8d8d5901f3fae37dc25ac0a431f 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -35,7 +35,8 @@ do_install () {
        rm -rf ${D}${datadir}/
 
        # We use libiberty from binutils
-       rm -f ${D}${exec_prefix}/lib/lib/libiberty.a
+       find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+       find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
 
        # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
        # found. These need to be relative paths so they work in different locations.

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
index e65d5df671789da6dd819783b32ac602bba79996..9a30cb51195a5376bff61bc8390e0978aaa36b3c 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r3"
+PR = "r4"
 

diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
index 399cdf9296406fa2b9fdc50c36dee6924974bd59..78bb05a4745fc1dba1885d898d86188ab7b07342 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc

diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
index 240caf56f78be399232b9c66d13f6a0302401cdb..fec53b931cd0145fe1540d36fc2951a49d56ae65 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross-initial_${PV}.bb
 require gcc-crosssdk-initial.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
index a6653ddfcc0f8c2fee3d907352f8211e78e235f8..161d870e639958f91e930ca9ddce11f69733a147 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross-intermediate_${PV}.bb
 require gcc-crosssdk-intermediate.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
index 129e8d31a4b9c0c8a0d43d02cfdf81f7fd5f6bb2..70690881aa57a17eb5e9b91f3fe3349baf0ec62c 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-crosssdk.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index 4f902fa149a8d93448b37c1f9fa52a4b4b4f8a7c..04c81017df89f289f0006a22d41f107e3fc292a2 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -27,6 +27,10 @@ do_install () {
                rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
        done
 
+       # We use libiberty from binutils
+       find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+       find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+
        # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
        if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
                dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS}

diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 3286da6a95decc4a0fd57416cdb5b1f39e17ad85..d61e96b57bf560e36b20f5c59afda161b8faffe2 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -86,6 +86,10 @@ do_install () {
        # We don't care about the gcc-<version> ones for this
        rm -f *gcc-?.?*
 
+       # We use libiberty from binutils
+       find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+       find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+
        # Symlinks so we can use these trivially on the target
        ln -sf ${TARGET_SYS}-g77 g77 || true
        ln -sf ${TARGET_SYS}-gfortran gfortran || true

diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index 919d4b09383ed1c61476421dc7ba8738d8dd7d2f..25e455c05ae750168ca272e3f64673bfe7a8d238 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc