Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

5 files changed, 72 insertions, 79 deletions

diff --git a/gcc/gcc-cross_3.3.2.oe b/gcc/gcc-cross_3.3.2.oe
index e01ec2f0e0..ad601bc31a 100644
--- a/gcc/gcc-cross_3.3.2.oe
+++ b/gcc/gcc-cross_3.3.2.oe
@@ -54,10 +54,10 @@ do_stage_append () {
 	rm -f ${CROSS_DIR}/bin/*gccbug
 
 	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_DIR}/target/include/c++ ]; then
-		mkdir -p ${STAGING_DIR}/target/include
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
 		ln -s ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_DIR}/target/include/
+			${STAGING_INCDIR}/
 	fi
 
 	# We use libiberty from binutils
diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index e01ec2f0e0..ad601bc31a 100644
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -54,10 +54,10 @@ do_stage_append () {
 	rm -f ${CROSS_DIR}/bin/*gccbug
 
 	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_DIR}/target/include/c++ ]; then
-		mkdir -p ${STAGING_DIR}/target/include
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
 		ln -s ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_DIR}/target/include/
+			${STAGING_INCDIR}/
 	fi
 
 	# We use libiberty from binutils
diff --git a/gcc/gcc-uclibc-cross_3.3.2.oe b/gcc/gcc-uclibc-cross_3.3.2.oe
index f370e24952..d83b115908 100644
--- a/gcc/gcc-uclibc-cross_3.3.2.oe
+++ b/gcc/gcc-uclibc-cross_3.3.2.oe
@@ -51,10 +51,10 @@ do_stage_append () {
 	rm -f ${CROSS_DIR}/bin/*gccbug
 
 	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_DIR}/target/include/c++ ]; then
-		mkdir -p ${STAGING_DIR}/target/include
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
 		ln -s ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_DIR}/target/include/
+			${STAGING_INCDIR}/
 	fi
 
 	# We use libiberty from binutils
diff --git a/gcc/gcc-uclibc-cross_3.3.3.oe b/gcc/gcc-uclibc-cross_3.3.3.oe
index e7d8b4c493..123c804d58 100644
--- a/gcc/gcc-uclibc-cross_3.3.3.oe
+++ b/gcc/gcc-uclibc-cross_3.3.3.oe
@@ -51,10 +51,10 @@ do_stage_append () {
 	rm -f ${CROSS_DIR}/bin/*gccbug
 
 	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_DIR}/target/include/c++ ]; then
-		mkdir -p ${STAGING_DIR}/target/include
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
 		ln -s ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_DIR}/target/include/
+			${STAGING_INCDIR}/
 	fi
 
 	# We use libiberty from binutils
diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 2fad557bd2..688a3efb3d 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -1,69 +1,61 @@
 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/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
+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/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://${FILESDIR}/config.sub.patch;patch=1 \
 	   file://${FILESDIR}/empty6.patch;patch=1 \
 	   file://${FILESDIR}/pr10392-1-test.patch;patch=1 \
@@ -90,15 +82,16 @@ SRC_URI = ${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://${FILESDIR}/arm-tune.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/arm-xscale.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/arm-14302.patch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-ldm-peephole.patch;patch=1;pnum=0
+	   file://${FILESDIR}/arm-ldm-peephole.patch;patch=1;pnum=0"
+
 MIRRORS_prepend () {
 ${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 \
@@ -107,7 +100,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