[oe-commits] Stefan Herbrechtsmeier : gcc: Remove package libstdc++-dev and libgcc-dev from gcc-cross

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: caf9b3cf2766c3f2edc639a150fc5d52a605260e
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=caf9b3cf2766c3f2edc639a150fc5d52a605260e

Author: Stefan Herbrechtsmeier <sherbrec at cit-ec.uni-bielefeld.de>
Date:   Tue Aug 30 22:29:10 2011 +0000

gcc: Remove package libstdc++-dev and libgcc-dev from gcc-cross

Remove package libstdc++-dev and libgcc-dev from gcc-cross as they
already provided by gcc.

Commit 8c42351519ece9ed60659a103e624d2e154b3641 add dev packages
(libstdc++-dev libgcc-dev) to gcc-cross (gcc-package-cross.inc)
which are already part of gcc. The libgcc-dev package both include
the libgcc_s.so file which triggers a 'file is already provided by
package' error on incremental builds. The libstdc++-dev package have
Acked-by: Steffen Sledz <sledz at dresearch-fe.de>

different content and is empty on some archs (armv5te, armv7e).
The empty package triggers a 'Cannot satisfy the following
dependencies for task-sdk-bare' error. If an empty libstdc++-dev
package is generated it triggers a '..../usr/include/c++ not exist'
error as this is part of the package from gcc but not gcc-cross.

Signed-off-by: Stefan Herbrechtsmeier <sherbrec at cit-ec.uni-bielefeld.de>
Acked-by: Steffen Sledz <sledz at dresearch-fe.de>

---

 recipes/gcc/gcc-4.3.3.inc         |    2 +-
 recipes/gcc/gcc-4.5.inc           |    2 +-
 recipes/gcc/gcc-package-cross.inc |    4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 649fdfe..8b6ffe5 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv3"
 DEPENDS = "mpfr gmp"
 NATIVEDEPS = "mpfr-native gmp-native"
 
-INC_PR = "r23"
+INC_PR = "r24"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc
index 69229ef..2777dca 100644
--- a/recipes/gcc/gcc-4.5.inc
+++ b/recipes/gcc/gcc-4.5.inc
@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
 
-INC_PR = "r37"
+INC_PR = "r38"
 
 SRCREV = "170880"
 PV = "4.5"
diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
index 1533069..8d52b6f 100644
--- a/recipes/gcc/gcc-package-cross.inc
+++ b/recipes/gcc/gcc-package-cross.inc
@@ -4,7 +4,7 @@ PACKAGE_STRIP = "no"
 
 SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
 
-PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran libstdc++-dev libgcc-dev"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
@@ -14,11 +14,9 @@ FILES_libssp = "${target_libdir}/libssp.so.*"
 FILES_libgfortran = "${target_libdir}/libgfortran.so.*"
 
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
-FILES_libgcc-dev = "${target_libdir}/libgcc_s.so"
 
 FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 
-FILES_libstdc++-dev = "${target_datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${target_base_libdir}