First pass of .oe cleanups.

BKrev: 40529f4crFtRY5_1DubNmWhDeHSmPw

8 files changed, 180 insertions, 53 deletions

diff --git a/binutils/binutils-cross_2.14.90.0.6.oe b/binutils/binutils-cross_2.14.90.0.6.oe
index dd1aa7622d..8a9fdc2537 100644
--- a/binutils/binutils-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-cross_2.14.90.0.6.oe
@@ -1,8 +1,8 @@
 include binutils_${PV}.oe
 inherit cross
-PROVIDES = virtual/${TARGET_PREFIX}binutils
-DEPENDS = patcher
-FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "patcher"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
 PACKAGES =
 EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
 		--disable-nls \
diff --git a/binutils/binutils-cross_2.14.90.0.7.oe b/binutils/binutils-cross_2.14.90.0.7.oe
index dd1aa7622d..8a9fdc2537 100644
--- a/binutils/binutils-cross_2.14.90.0.7.oe
+++ b/binutils/binutils-cross_2.14.90.0.7.oe
@@ -1,8 +1,8 @@
 include binutils_${PV}.oe
 inherit cross
-PROVIDES = virtual/${TARGET_PREFIX}binutils
-DEPENDS = patcher
-FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "patcher"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
 PACKAGES =
 EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
 		--disable-nls \
diff --git a/binutils/binutils-cross_2.14.90.0.8.oe b/binutils/binutils-cross_2.14.90.0.8.oe
index dd1aa7622d..8a9fdc2537 100644
--- a/binutils/binutils-cross_2.14.90.0.8.oe
+++ b/binutils/binutils-cross_2.14.90.0.8.oe
@@ -1,8 +1,8 @@
 include binutils_${PV}.oe
 inherit cross
-PROVIDES = virtual/${TARGET_PREFIX}binutils
-DEPENDS = patcher
-FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "patcher"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
 PACKAGES =
 EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
 		--disable-nls \
diff --git a/binutils/binutils-cross_2.15.90.0.1.oe b/binutils/binutils-cross_2.15.90.0.1.oe
index e69de29bb2..8a9fdc2537 100644
--- a/binutils/binutils-cross_2.15.90.0.1.oe
+++ b/binutils/binutils-cross_2.15.90.0.1.oe
@@ -0,0 +1,33 @@
+include binutils_${PV}.oe
+inherit cross
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "patcher"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
+PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX}'
+
+do_stage () {
+	oe_runmake install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${CROSS_DIR}/lib/ldscripts
+	rm -rf ${CROSS_DIR}/share/info
+	rm -rf ${CROSS_DIR}/share/locale
+	rm -rf ${CROSS_DIR}/share/man
+	rmdir ${CROSS_DIR}/share || :
+	rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+	rmdir ${CROSS_DIR}/${libdir} || :
+	rmdir ${CROSS_DIR}/${prefix} || :
+
+	# We want to move this into the target specific location
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+	rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+	:
+}
+
diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 8aa5489d0d..6cf67346d9 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -1,27 +1,27 @@
 inherit autotools
 
-DESCRIPTION := A GNU collection of binary utilities
-LICENSE := GPL
-MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+DESCRIPTION = "A GNU collection of binary utilities"
+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}-
+TARGET_VENDOR := ""
+TARGET_SYS := "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX := "${TARGET_SYS}-"
 
-DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
-           virtual/libc patcher
+DEPENDS := "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
+            virtual/libc patcher"
 
-PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
-FILES_${PN} =  \
-	${bindir}/${TARGET_PREFIX}*
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}*"
 
-FILES_${PN}-dev = \
+FILES_${PN}-dev = " \
 	${includedir} \
-	${libdir}/*.a
+	${libdir}/*.a"
 
-FILES_${PN}-symlinks = \
+FILES_${PN}-symlinks = " \
 	${bindir}/addr2line \
 	${bindir}/ar \
 	${bindir}/as \
@@ -33,44 +33,44 @@ FILES_${PN}-symlinks = \
 	${bindir}/readelf \
 	${bindir}/size \
 	${bindir}/strings \
-	${bindir}/strip
+	${bindir}/strip"
 
-SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-           file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \
-           file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \
-           file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \
-           file://${FILESDIR}/binutils-012_check_ldrunpath_length.patch;patch=1 \
-           file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1 \
-           file://${FILESDIR}/binutils-906-hjl_libtool_dso.patch;patch=1
+SRC_URI := "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+            file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \
+            file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \
+            file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \
+            file://${FILESDIR}/binutils-012_check_ldrunpath_length.patch;patch=1 \
+            file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1 \
+            file://${FILESDIR}/binutils-906-hjl_libtool_dso.patch;patch=1"
 
-S := ${WORKDIR}/binutils-${PV}
-B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
+S := "${WORKDIR}/binutils-${PV}"
+B := "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = '--with-sysroot=${prefix}'
+EXTRA_OECONF = "--with-sysroot=${prefix}"
 
 # This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = configure-build-libiberty all
+EXTRA_OEMAKE = "configure-build-libiberty all"
 
-export AR = ${HOST_PREFIX}ar
-export AS = ${HOST_PREFIX}as
-export LD = ${HOST_PREFIX}ld
-export NM = ${HOST_PREFIX}nm
-export RANLIB = ${HOST_PREFIX}ranlib
-export OBJCOPY = ${HOST_PREFIX}objcopy
-export OBJDUMP = ${HOST_PREFIX}objdump
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
 
-export AR_FOR_TARGET = ${TARGET_PREFIX}ar
-export AS_FOR_TARGET = ${TARGET_PREFIX}as
-export LD_FOR_TARGET = ${TARGET_PREFIX}ld
-export NM_FOR_TARGET = ${TARGET_PREFIX}nm
-export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
 
-export CC_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
-export CXX_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
 
-export CC_FOR_BUILD = ${BUILD_CC}
+export CC_FOR_BUILD = "${BUILD_CC}"
 
-export CC = ${CCACHE} ${HOST_PREFIX}gcc
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
 
 do_configure () {
 	oe_runconf
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 8aa5489d0d..ca3c47b706 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -12,7 +12,7 @@ TARGET_PREFIX := ${TARGET_SYS}-
 DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
            virtual/libc patcher
 
-PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
 FILES_${PN} =  \
 	${bindir}/${TARGET_PREFIX}*
diff --git a/binutils/binutils_2.14.90.0.8.oe b/binutils/binutils_2.14.90.0.8.oe
index cf2a0ca477..d5fd0ce533 100644
--- a/binutils/binutils_2.14.90.0.8.oe
+++ b/binutils/binutils_2.14.90.0.8.oe
@@ -12,7 +12,7 @@ TARGET_PREFIX := ${TARGET_SYS}-
 DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
            virtual/libc patcher
 
-PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
 FILES_${PN} =  \
 	${bindir}/${TARGET_PREFIX}*
diff --git a/binutils/binutils_2.15.90.0.1.oe b/binutils/binutils_2.15.90.0.1.oe
index e69de29bb2..d5fd0ce533 100644
--- a/binutils/binutils_2.15.90.0.1.oe
+++ b/binutils/binutils_2.15.90.0.1.oe
@@ -0,0 +1,94 @@
+inherit autotools
+
+DESCRIPTION := A GNU collection of binary utilities
+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/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
+           virtual/libc patcher
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} =  \
+	${bindir}/${TARGET_PREFIX}*
+
+FILES_${PN}-dev = \
+	${includedir} \
+	${libdir}/*.a
+
+FILES_${PN}-symlinks = \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip
+
+SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+           file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \
+           file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \
+           file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \
+           file://${FILESDIR}/binutils-012_check_ldrunpath_length.patch;patch=1 \
+           file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1
+
+S := ${WORKDIR}/binutils-${PV}
+B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
+
+EXTRA_OECONF = '--with-sysroot=${prefix}'
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = configure-build-libiberty all
+
+export AR = ${HOST_PREFIX}ar
+export AS = ${HOST_PREFIX}as
+export LD = ${HOST_PREFIX}ld
+export NM = ${HOST_PREFIX}nm
+export RANLIB = ${HOST_PREFIX}ranlib
+export OBJCOPY = ${HOST_PREFIX}objcopy
+export OBJDUMP = ${HOST_PREFIX}objdump
+
+export AR_FOR_TARGET = ${TARGET_PREFIX}ar
+export AS_FOR_TARGET = ${TARGET_PREFIX}as
+export LD_FOR_TARGET = ${TARGET_PREFIX}ld
+export NM_FOR_TARGET = ${TARGET_PREFIX}nm
+export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib
+
+export CC_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+export CXX_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+
+export CC_FOR_BUILD = ${BUILD_CC}
+
+export CC = ${CCACHE} ${HOST_PREFIX}gcc
+
+do_configure () {
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}/${libdir}/ldscripts
+
+	# Install the libiberty header
+	install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}/${includedir}
+
+	cd ${D}/${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}