gcc: Configure all gccs with --disable-install-libiberty

OE uses libiberty from binutils, since its properly compiled as pic
archive and applications and other libraries needing libiberty can
properly link with it.

With this option applied, explicit delete of libiberty headers and
libraries is not required in install step, since they wont get installed
in first place.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index bb4f6923f2bbc07f7a9300c43eee5f2316addbb2..a64c4caf0010349eb062fb52e8443b02fc670974 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -33,6 +33,7 @@ EXTRA_OECONF = "\
     --enable-libstdcxx-pch \
     --program-prefix=${TARGET_PREFIX} \
     --without-local-prefix \
+    --disable-install-libiberty \
     ${EXTRA_OECONF_BASE} \
     ${EXTRA_OECONF_GCC_FLOAT} \
     ${EXTRA_OECONF_PATHS} \

diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 4aac345bec9de428773938ea54701a4280d42bec..553ef7fe62d7cae6342b07a71f907096c67ff892 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -108,12 +108,6 @@ do_install () {
        # We don't care about the gcc-<version> copies
        rm -f ${D}${bindir}/*gcc-?.?*
 
-       # We use libiberty from binutils
-       rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
-       # Not sure where the strange paths come from
-       rm -f ${D}${libdir}/../lib/libiberty.a
-       rm -f ${D}${libdir}/libiberty.a
-
        # Cleanup empty directories which are not shipped
        # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
        # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686

diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index c68cdd5dc484d8acc5d638c016d8c849af3a01df..6fa8c274cd3bfaa74fc7ccee1675a20997bb19c5 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -117,10 +117,6 @@ do_install () {
        cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
        cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
 
-       # We use libiberty from binutils
-       find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
-       find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
-
        find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
 }
 

diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 34c1b2263b7bb0152949462ccd21bbac1c5dd098..8cb432780f54099e2fc090c82ac41449b401ea8a 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -192,10 +192,6 @@ do_install () {
        # We don't care about the gcc-<version> ones for this
        rm -f *gcc-?.?*
 
-       # We use libiberty from binutils
-       find ${D}${libdir} -name libiberty.a | xargs rm -f
-       find ${D}${libdir} -name libiberty.h | xargs rm -f
-
        # Not sure why we end up with these but we don't want them...
        rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*