Another pass of cleanups...

..cheated and made the parser temporarily more picky to spot the packages that need cleaning.

BKrev: 4061a6cbKWfvpS3a5Dml4UNIp_LkNQ

11 files changed, 175 insertions, 164 deletions

diff --git a/gcc/gcc-cross_3.3.2.oe b/gcc/gcc-cross_3.3.2.oe
index ad601bc31a..73192999e7 100644
--- a/gcc/gcc-cross_3.3.2.oe
+++ b/gcc/gcc-cross_3.3.2.oe
@@ -2,12 +2,12 @@ include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils glibc patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++
+DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-PACKAGES =
+PACKAGES = ""
 
-EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
 		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
 		--disable-nls \
@@ -18,12 +18,12 @@ EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--enable-shared \
 		--enable-c99 \
 		--enable-long-long \
-		--program-prefix=${TARGET_PREFIX}'
+		--program-prefix=${TARGET_PREFIX}"
 
-export CPPFLAGS =
-export CXXFLAGS =
-export CFLAGS =
-export LDFLAGS =
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
 
 do_configure () {
 	export CC="${BUILD_CC}"
diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index ad601bc31a..73192999e7 100644
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -2,12 +2,12 @@ include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils glibc patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++
+DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-PACKAGES =
+PACKAGES = ""
 
-EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
 		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
 		--disable-nls \
@@ -18,12 +18,12 @@ EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--enable-shared \
 		--enable-c99 \
 		--enable-long-long \
-		--program-prefix=${TARGET_PREFIX}'
+		--program-prefix=${TARGET_PREFIX}"
 
-export CPPFLAGS =
-export CXXFLAGS =
-export CFLAGS =
-export LDFLAGS =
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
 
 do_configure () {
 	export CC="${BUILD_CC}"
diff --git a/gcc/gcc-initial-cross_3.3.2.oe b/gcc/gcc-initial-cross_3.3.2.oe
index ad5dd8def6..4f9cb6ddb6 100644
--- a/gcc/gcc-initial-cross_3.3.2.oe
+++ b/gcc/gcc-initial-cross_3.3.2.oe
@@ -1,9 +1,9 @@
 include gcc-cross_${PV}.oe
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc-initial
+DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
-EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--disable-multilib \
 		--with-newlib \
 		--without-headers \
@@ -13,7 +13,7 @@ EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--enable-__cxa_atexit \
 		--enable-languages=c \
 		--disable-shared \
-		--program-prefix=${TARGET_SYS}-'
+		--program-prefix=${TARGET_PREFIX}"
 
 do_stage_prepend () {
 	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
diff --git a/gcc/gcc-initial-cross_3.3.3.oe b/gcc/gcc-initial-cross_3.3.3.oe
index e69de29bb2..4f9cb6ddb6 100644
--- a/gcc/gcc-initial-cross_3.3.3.oe
+++ b/gcc/gcc-initial-cross_3.3.3.oe
@@ -0,0 +1,21 @@
+include gcc-cross_${PV}.oe
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--disable-multilib \
+		--with-newlib \
+		--without-headers \
+		--disable-nls \
+		--enable-threads=no \
+		--enable-symvers=gnu \
+		--enable-__cxa_atexit \
+		--enable-languages=c \
+		--disable-shared \
+		--program-prefix=${TARGET_PREFIX}"
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
+}
diff --git a/gcc/gcc-initial-uclibc-cross_3.3.2.oe b/gcc/gcc-initial-uclibc-cross_3.3.2.oe
index cfcd8205af..ea0b0f1371 100644
--- a/gcc/gcc-initial-uclibc-cross_3.3.2.oe
+++ b/gcc/gcc-initial-uclibc-cross_3.3.2.oe
@@ -1,9 +1,9 @@
 include gcc-uclibc-cross_${PV}.oe
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc-initial
+DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
                 --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
                 --enable-target-optspace \
                 --disable-nls \
@@ -13,4 +13,4 @@ EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
                 --disable-shared \
 		--disable-threads \
                 --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-initial-uclibc-cross_3.3.3.oe b/gcc/gcc-initial-uclibc-cross_3.3.3.oe
index cfcd8205af..ea0b0f1371 100644
--- a/gcc/gcc-initial-uclibc-cross_3.3.3.oe
+++ b/gcc/gcc-initial-uclibc-cross_3.3.3.oe
@@ -1,9 +1,9 @@
 include gcc-uclibc-cross_${PV}.oe
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc-initial
+DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
                 --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
                 --enable-target-optspace \
                 --disable-nls \
@@ -13,4 +13,4 @@ EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
                 --disable-shared \
 		--disable-threads \
                 --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-uclibc-cross_3.3.2.oe b/gcc/gcc-uclibc-cross_3.3.2.oe
index d83b115908..139559d6b1 100644
--- a/gcc/gcc-uclibc-cross_3.3.2.oe
+++ b/gcc/gcc-uclibc-cross_3.3.2.oe
@@ -1,12 +1,12 @@
 inherit cross
 include gcc-uclibc_${PV}.oe
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils uclibc patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++
+DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-PACKAGES =
+PACKAGES = ""
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
                 --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
                 --enable-target-optspace \
                 --disable-nls \
@@ -16,12 +16,12 @@ EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
                 --enable-shared \
                 --enable-multilib \
 		--enable-threads=posix \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
 
-export CPPFLAGS =
-export CXXFLAGS =
-export CFLAGS =
-export LDFLAGS =
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
 
 do_configure () {
 	export CC="${BUILD_CC}"
diff --git a/gcc/gcc-uclibc-cross_3.3.3.oe b/gcc/gcc-uclibc-cross_3.3.3.oe
index 123c804d58..5746f3fc71 100644
--- a/gcc/gcc-uclibc-cross_3.3.3.oe
+++ b/gcc/gcc-uclibc-cross_3.3.3.oe
@@ -1,12 +1,12 @@
 inherit cross
 include gcc-uclibc_${PV}.oe
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils uclibc patcher-native
-PROVIDES := virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++
+DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc patcher-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-PACKAGES =
+PACKAGES = ""
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
                 --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
                 --enable-target-optspace \
                 --disable-nls \
@@ -16,12 +16,12 @@ EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
                 --enable-shared \
 		--enable-threads \
                 --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
 
-export CPPFLAGS =
-export CXXFLAGS =
-export CFLAGS =
-export LDFLAGS =
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
 
 do_configure () {
 	export CC="${BUILD_CC}"
diff --git a/gcc/gcc-uclibc_3.3.2.oe b/gcc/gcc-uclibc_3.3.2.oe
index bcd814fd15..cdcfed787b 100644
--- a/gcc/gcc-uclibc_3.3.2.oe
+++ b/gcc/gcc-uclibc_3.3.2.oe
@@ -1,35 +1,34 @@
 include gcc_${PV}.oe
-FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-DESCRIPTION := The GNU cc and gcc C compilers (uclibc).
-LICENSE := GPL
-MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+DESCRIPTION = "The GNU cc and gcc C compilers (uclibc)."
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 # This will ONLY build to this target
-TARGET_VENDOR := -uclibc
-TARGET_SYS := ${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}
-TARGET_PREFIX := ${TARGET_SYS}-
+TARGET_VENDOR = "-uclibc"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
 
-DEPENDS := virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           uclibc patcher
+DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
+           uclibc patcher"
 
-PACKAGES = ${PN} ${PN}-symlinks \
+PACKAGES = "${PN} ${PN}-symlinks \
            ${PN}-c++ ${PN}-c++-symlinks \
            uclibc-libgcc uclibc-libstdc++ uclibc-libstdc++-dev \
-           ${PN}-doc
+           ${PN}-doc"
 
 # The rest of these are properly defined in gcc_${PV}.oe
-FILES_uclibc-libgcc = ${FILES_libgcc}
-FILES_uclibc-libstdc++ = ${FILES_libstdc++}
-FILES_uclibc-libstdc++-dev = \
-	${includedir}/c++/${PV}-uclibc \
-	${libdir}/libstdc++.so \
-	${libdir}/libstdc++.la \
-	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
-	${libdir}/libsupc++.a
+FILES_uclibc-libgcc = "${FILES_libgcc}"
+FILES_uclibc-libstdc++ = "${FILES_libstdc++}"
+FILES_uclibc-libstdc++-dev = "${includedir}/c++/${PV}-uclibc \
+			      ${libdir}/libstdc++.so \
+			      ${libdir}/libstdc++.la \
+			      ${libdir}/libstdc++.a \
+			      ${libdir}/libsupc++.la \
+			      ${libdir}/libsupc++.a"
 
-EXTRA_OECONF := --with-local-prefix=${prefix}/local \
+EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV}-uclibc \
                 --enable-target-optspace \
                 --disable-nls \
@@ -39,7 +38,7 @@ EXTRA_OECONF := --with-local-prefix=${prefix}/local \
                 --enable-shared \
                 --enable-multilib \
 		--enable-threads=posix \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
 
 gccbuild_do_patch () {
 	#
diff --git a/gcc/gcc-uclibc_3.3.3.oe b/gcc/gcc-uclibc_3.3.3.oe
index 4a53d63b09..cdcfed787b 100644
--- a/gcc/gcc-uclibc_3.3.3.oe
+++ b/gcc/gcc-uclibc_3.3.3.oe
@@ -1,35 +1,34 @@
 include gcc_${PV}.oe
-FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-DESCRIPTION := The GNU cc and gcc C compilers (uclibc).
-LICENSE := GPL
-MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+DESCRIPTION = "The GNU cc and gcc C compilers (uclibc)."
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 # This will ONLY build to this target
-TARGET_VENDOR := -uclibc
-TARGET_SYS := ${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}
-TARGET_PREFIX := ${TARGET_SYS}-
+TARGET_VENDOR = "-uclibc"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
 
-DEPENDS := virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           uclibc patcher
+DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
+           uclibc patcher"
 
-PACKAGES = ${PN} ${PN}-symlinks \
+PACKAGES = "${PN} ${PN}-symlinks \
            ${PN}-c++ ${PN}-c++-symlinks \
            uclibc-libgcc uclibc-libstdc++ uclibc-libstdc++-dev \
-           ${PN}-doc
+           ${PN}-doc"
 
 # The rest of these are properly defined in gcc_${PV}.oe
-FILES_uclibc-libgcc = ${FILES_libgcc}
-FILES_uclibc-libstdc++ = ${FILES_libstdc++}
-FILES_uclibc-libstdc++-dev = \
-	${includedir}/c++/${PV}-uclibc \
-	${libdir}/libstdc++.so \
-	${libdir}/libstdc++.la \
-	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
-	${libdir}/libsupc++.a
+FILES_uclibc-libgcc = "${FILES_libgcc}"
+FILES_uclibc-libstdc++ = "${FILES_libstdc++}"
+FILES_uclibc-libstdc++-dev = "${includedir}/c++/${PV}-uclibc \
+			      ${libdir}/libstdc++.so \
+			      ${libdir}/libstdc++.la \
+			      ${libdir}/libstdc++.a \
+			      ${libdir}/libsupc++.la \
+			      ${libdir}/libsupc++.a"
 
-EXTRA_OECONF := --with-local-prefix=${prefix}/local \
+EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV}-uclibc \
                 --enable-target-optspace \
                 --disable-nls \
@@ -37,9 +36,9 @@ EXTRA_OECONF := --with-local-prefix=${prefix}/local \
                 --disable-__cxa_atexit \
                 --enable-languages=c,c++ \
                 --enable-shared \
-		--enable-threads \
                 --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+		--enable-threads=posix \
+                --program-prefix=${TARGET_PREFIX}"
 
 gccbuild_do_patch () {
 	#
diff --git a/gcc/gcc_3.3.2.oe b/gcc/gcc_3.3.2.oe
index 11a5b0c5c7..2273c6acc0 100644
--- a/gcc/gcc_3.3.2.oe
+++ b/gcc/gcc_3.3.2.oe
@@ -1,80 +1,73 @@
 inherit autotools
 
-DESCRIPTION := The GNU cc and gcc C compilers.
-LICENSE := GPL
-MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+DESCRIPTION = "The GNU cc and gcc C compilers."
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 # This will ONLY build to this target
-TARGET_VENDOR :=
-TARGET_SYS := ${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}
-TARGET_PREFIX := ${TARGET_SYS}-
-
-DEPENDS := virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           glibc patcher
-
-PACKAGES = ${PN} ${PN}-symlinks \
-           ${PN}-c++ ${PN}-c++-symlinks \
-           libgcc libstdc++ libstdc++-dev \
-           ${PN}-doc
-
-FILES_${PN} = \
-	${bindir}/${TARGET_PREFIX}gcc \
-	${bindir}/${TARGET_PREFIX}cpp \
-	${bindir}/${TARGET_PREFIX}gcov \
-	${bindir}/${TARGET_PREFIX}gccbug \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include
-
-FILES_${PN}-symlinks = \
-	${bindir}/cc \
-	${bindir}/gcc \
-	${bindir}/cpp \
-	${bindir}/gcov \
-	${bindir}/gccbug
-
-FILES_${PN}-c++ = \
-	${bindir}/${TARGET_PREFIX}g++ \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus \
-
-FILES_${PN}-c++-symlinks = \
-	${bindir}/c++ \
-	${bindir}/g++
-
-FILES_libgcc = \
-	/lib/libgcc_s.so.*
-
-FILES_libstdc++ = \
-	${libdir}/libstdc++.so.*
-
-FILES_libstdc++-dev = \
-	${includedir}/c++/${PV} \
-	${libdir}/libstdc++.so \
-	${libdir}/libstdc++.la \
-	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
-	${libdir}/libsupc++.a
-
-FILES_${PN}-doc = \
-	${infodir} \
-	${mandir} \
-	${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README
-
-SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	  file://${FILESDIR}/gcc-001-disable-mathf.patch;patch=1 \
-	  file://${FILESDIR}/gcc-006-include-search.patch;patch=1 \
-	  file://${FILESDIR}/gcc-810-libstd++-locale.patch;patch=1
+TARGET_VENDOR = ""
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
+
+DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
+           glibc patcher"
+
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            libgcc libstdc++ libstdc++-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include"
+
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus"
+
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libgcc = "/lib/libgcc_s.so.*"
+
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://${FILESDIR}/gcc-001-disable-mathf.patch;patch=1 \
+	   file://${FILESDIR}/gcc-006-include-search.patch;patch=1 \
+	   file://${FILESDIR}/gcc-810-libstd++-locale.patch;patch=1"
+
 MIRRORS_prepend () {
-${GNU_MIRROR}/gcc/gcc-${PV}/	http://gcc.get-software.com/releases/gcc-${PV}/
+${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
 }
 
-S := ${WORKDIR}/gcc-${PV}
-B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF := --with-local-prefix=${prefix}/local \
+EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV} \
                 --enable-target-optspace \
                 --disable-nls \
@@ -83,7 +76,7 @@ EXTRA_OECONF := --with-local-prefix=${prefix}/local \
                 --enable-languages=c,c++ \
                 --enable-shared \
                 --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+                --program-prefix=${TARGET_PREFIX}"
 
 do_configure () {
 	# Setup these vars for cross building only
@@ -141,4 +134,3 @@ do_install () {
 	ln -s g++ c++
 	ln -s gcc cc
 }
-