gcc: sync with .dev s/include/require and add missing files

19 files changed, 92 insertions, 35 deletions

diff --git a/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..120cf55a0f
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1.0/Makefile.in
+===================================================================
+--- gcc-4.1.0.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1.0/Makefile.in	2006-08-06 13:29:36.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ba7d7257d9
--- /dev/null
+++ b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in	2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in	2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb
index 68dafe3f1a..037f3032a6 100644
--- a/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb
index 68dafe3f1a..037f3032a6 100644
--- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb
+++ b/packages/gcc/gcc-cross-initial_4.1-20060217.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb
index 63308c2cfe..1e23ef9330 100644
--- a/packages/gcc/gcc-cross-initial_4.1.0.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.0.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb
index 63308c2cfe..1e23ef9330 100644
--- a/packages/gcc/gcc-cross-initial_4.1.1.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.1.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 6e299e8299..d2dc240126 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb
new file mode 100644
index 0000000000..d2dc240126
--- /dev/null
+++ b/packages/gcc/gcc-cross_4.1-20060217.bb
@@ -0,0 +1,16 @@
+require gcc_${PV}.bb
+# path mangling, needed by the cross packaging
+require gcc-paths-cross.inc
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r1"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# cross build
+require gcc3-build-cross.inc
+# cross packaging
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 4b0b5a1311..4e380c5f66 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 76e14ddca1..4c530175f3 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,18 +1,18 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r2"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_4.2-20060513.bb b/packages/gcc/gcc-cross_4.2-20060513.bb
index 4b0b5a1311..4e380c5f66 100644
--- a/packages/gcc/gcc-cross_4.2-20060513.bb
+++ b/packages/gcc/gcc-cross_4.2-20060513.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 4b1f8f68e8..ea771a334b 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -7,6 +7,7 @@ OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
 PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
+PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
 
 PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
 PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc
index 384886c76e..e8a23e0d40 100644
--- a/packages/gcc/gcc3-build-cross.inc
+++ b/packages/gcc/gcc3-build-cross.inc
@@ -21,10 +21,6 @@ do_stage_append () {
 		rm -rf ${CROSS_DIR}/$d
 	done
 
-	# These aren't useful on the cross toolchain
-	rm -f ${CROSS_DIR}/bin/*gcov
-	rm -f ${CROSS_DIR}/bin/*gccbug
-
 	# Fix a few include links so cross builds are happier
 	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
 		mkdir -p ${STAGING_INCDIR}
diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc
index 8b80f4820a..b8a214a590 100644
--- a/packages/gcc/gcc4-build.inc
+++ b/packages/gcc/gcc4-build.inc
@@ -1,5 +1,5 @@
-FORTRAN = "f95"
-HAS_GFORTRAN = "yes"
+FORTRAN = ",f95"
+HAS_GFORTRAN ?= "yes"
 HAS_G2C = "no"
 
 include gcc3-build.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 5a9d00e73b..d288badf45 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -26,7 +26,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 
-include gcc4-build.inc
+require gcc4-build.inc
 
 EXTRA_OECONF += "--disable-libssp"
 
diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
new file mode 100644
index 0000000000..6889f04a36
--- /dev/null
+++ b/packages/gcc/gcc_4.1-20060217.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+DEFAULT_PREFERENCE = "-99999"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
+	file://ldflags.patch;patch=1"
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+require gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 4d44978dab..80a4b89d7c 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index a0dcf94be1..1078d61d33 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb
index 68fa6d8d06..5b68fb254b 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""