merge of '985da843108cf6ed11892842f921418171e3d429'

     and '9a694dbde6dd96803bccae08f8e83850e03f2b58'

8 files changed, 111 insertions, 86 deletions

diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc
index 3d57d01113..2976d58d05 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package.inc
@@ -1,45 +1,58 @@
 gcclibdir ?= "${libdir}/gcc"
 BINV ?= "${PV}"
 
-PACKAGES = "libgcc ${PN} ${PN}-symlinks \
-            g++ g++-symlinks \
-	    cpp cpp-symlinks \
-            g77 g77-symlinks \
-            gfortran gfortran-symlinks \
-	    gcov gcov-symlinks \
-            libmudflap libmudflap-dev \
-	    libstdc++ libg2c \
-	    libstdc++-dev libg2c-dev \
-            ${PN}-doc"
+PACKAGES = "\
+  libgcc ${PN} ${PN}-symlinks \
+  g++ g++-symlinks \
+  cpp cpp-symlinks \
+  g77 g77-symlinks \
+  gfortran gfortran-symlinks \
+  gcov gcov-symlinks \
+  libmudflap libmudflap-dev \
+  libstdc++ libg2c \
+  libstdc++-dev libg2c-dev \
+  ${PN}-doc \
+"
 
 # We really need HOST_SYS here for some packages and TARGET_SYS for others.
 # For now, libgcc is most important so we fix for that - RP.
 SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
 
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
-	       ${bindir}/${TARGET_PREFIX}gccbug \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/gccbug"
-
-FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
-FILES_g77-symlinks = "${bindir}/g77 \
-			    ${bindir}/f77"
-
-FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
-FILES_gfortran-symlinks = "${bindir}/gfortran \
-			    ${bindir}/f95"
-
-FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
-	     ${base_libdir}/cpp"
+FILES_${PN} = "\
+  ${bindir}/${TARGET_PREFIX}gcc \
+  ${bindir}/${TARGET_PREFIX}gccbug \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+"
+FILES_${PN}-symlinks = "\
+  ${bindir}/cc \
+  ${bindir}/gcc \
+  ${bindir}/gccbug \
+"
+
+FILES_g77 = "\
+  ${bindir}/${TARGET_PREFIX}g77 \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+FILES_g77-symlinks = "\
+  ${bindir}/g77 \
+  ${bindir}/f77 \
+"
+FILES_gfortran = "\
+  ${bindir}/${TARGET_PREFIX}gfortran \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
+"
+FILES_gfortran-symlinks = "\
+  ${bindir}/gfortran \
+  ${bindir}/f95"
+
+FILES_cpp = "\
+  ${bindir}/${TARGET_PREFIX}cpp \
+  ${base_libdir}/cpp \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
 FILES_cpp-symlinks = "${bindir}/cpp"
 
 FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
@@ -50,37 +63,48 @@ FILES_libgcc-dev = "${base_libdir}/libgcc*.so"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
-FILES_libg2c-dev = "${libdir}/libg2c.so \
-		    ${libdir}/libg2c.a \
-		    ${libdir}/libfrtbegin.a"
-
-FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
-FILES_g++-symlinks = "${bindir}/c++ \
-			    ${bindir}/g++"
+FILES_libg2c-dev = "\
+  ${libdir}/libg2c.so \
+  ${libdir}/libg2c.a \
+  ${libdir}/libfrtbegin.a \
+"
+
+FILES_g++ = "\
+  ${bindir}/${TARGET_PREFIX}g++ \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES_g++-symlinks = "\
+  ${bindir}/c++ \
+  ${bindir}/g++ \
+"
 
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
+FILES_libstdc++-dev = "\
+  ${includedir}/c++/${BINV} \
+  ${libdir}/libstdc++.so \
+  ${libdir}/libstdc++.la \
+  ${libdir}/libstdc++.a \
+  ${libdir}/libsupc++.la \
+  ${libdir}/libsupc++.a \
+"
 
 FILES_libmudflap = "${libdir}/libmudflap*.so.*"
-FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
-                        ${libdir}/libmudflap*.a \
-                        ${libdir}/libmudflap*.a"
-
-
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
+FILES_libmudflap-dev = "\
+  ${libdir}/libmudflap*.so \
+  ${libdir}/libmudflap*.a \
+  ${libdir}/libmudflap*.a \
+"
+
+FILES_${PN}-doc = "\
+  ${infodir} \
+  ${mandir} \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
 
 python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-        bb.build.exec_func('package_do_package', d)
+    if bb.data.getVar('DEBIAN_NAMES', d, 1):
+        bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+    bb.build.exec_func('package_do_package', d)
 }
 
 
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 28561e1e07..9f75bf1f54 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,8 +1,8 @@
-PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
+PR = "r3"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 19d67ab1b4..2945592659 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "mpfr gmp"
-PR = "r6"
+PR = "r7"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index a9dbad579f..6a5f607729 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,8 +1,9 @@
-PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
+PR = "r3"
+
 DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 8d08df6b8c..4b538219b3 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,8 +1,8 @@
-PR = "r17"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
+PR = "r18"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index b3eb0100e8..fc75e942bb 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment the -cross .bb PR too.
-PR = "r10"
+PR = "r11"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 688ccdaeb8..dac620397b 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,8 +1,8 @@
-PR = "r7"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
+PR = "r8"
 
 inherit autotools gettext
 
@@ -11,8 +11,8 @@ require gcc-package.inc
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://203-uclibc-locale-no__x.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://203-uclibc-locale-no__x.patch;patch=1 \
 	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
 	file://205-uclibc-locale-update.patch;patch=1 \
 	file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://302-c99-snprintf.patch;patch=1 \
 	file://303-c99-complex-ugly-hack.patch;patch=1 \
 	file://304-index_macro.patch;patch=1 \
-        file://305-libmudflap-susv3-legacy.patch;patch=1 \
-        file://306-libstdc++-namespace.patch;patch=1 \
+	file://305-libmudflap-susv3-legacy.patch;patch=1 \
+	file://306-libstdc++-namespace.patch;patch=1 \
 	file://307-locale_facets.patch;patch=1 \
-        file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
 	file://800-arm-bigendian.patch;patch=1 \
 	file://904-flatten-switch-stmt-00.patch;patch=1 \
@@ -36,10 +36,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
 	file://cache-amnesia.patch;patch=1 \
-        file://gfortran.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
+	file://gfortran.patch;patch=1 \
+	file://pr34130.patch;patch=1 \
 "
 
 SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index dea9f14d9a..06cbbb23e4 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,8 +1,8 @@
-PR = "r3"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
+PR = "r4"
 
 inherit autotools gettext
 
@@ -11,8 +11,8 @@ require gcc-package.inc
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://203-uclibc-locale-no__x.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://203-uclibc-locale-no__x.patch;patch=1 \
 	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
 	file://205-uclibc-locale-update.patch;patch=1 \
 	file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://302-c99-snprintf.patch;patch=1 \
 	file://303-c99-complex-ugly-hack.patch;patch=1 \
 	file://304-index_macro.patch;patch=1 \
-        file://305-libmudflap-susv3-legacy.patch;patch=1 \
-        file://306-libstdc++-namespace.patch;patch=1 \
+	file://305-libmudflap-susv3-legacy.patch;patch=1 \
+	file://306-libstdc++-namespace.patch;patch=1 \
 	file://307-locale_facets.patch;patch=1 \
-        file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
 	file://800-arm-bigendian.patch;patch=1 \
 	file://801-arm-bigendian-eabi.patch;patch=1 \
@@ -37,12 +37,12 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
 	file://cache-amnesia.patch;patch=1 \
-        file://gfortran.patch;patch=1 \
-        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
-        file://fortran-static-linking.patch;patch=1 \
+	file://gfortran.patch;patch=1 \
+	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+	file://pr34130.patch;patch=1 \
+	file://fortran-static-linking.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \