Adjust the way we handle our BUILD vs HOST vs TARGET.

BKrev: 3f6a099cJfKoPCEz0cqWUDlnW4duuw

12 files changed, 55 insertions, 63 deletions

diff --git a/content/cross-binutils-2.13.2.oe b/content/cross-binutils-2.13.2.oe
index 6003e3e488..aa174e1c69 100644
--- a/content/cross-binutils-2.13.2.oe
+++ b/content/cross-binutils-2.13.2.oe
@@ -8,20 +8,9 @@ PROVIDES="virtual/${ARCH}-${OS}-binutils"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/binutils/binutils-2.13.2.tar.gz"
 S = ${WORKDIR}/binutils-${PV}
 
-OLDOS := ${OS}
-OLDARCH := ${ARCH}
 CROSS_DIR := ${CROSS_DIR}
-inherit noncross autotools
-
-do_configure() {
-	./configure --prefix=${CROSS_DIR} --target=${OLDARCH}-${OLDOS}
-}
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+inherit cross autotools
 
 EXTRA_OEMAKE =
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake install
-}
diff --git a/content/cross-binutils-2.14.90.0.6.oe b/content/cross-binutils-2.14.90.0.6.oe
index c8e186665c..68f0ee115c 100644
--- a/content/cross-binutils-2.14.90.0.6.oe
+++ b/content/cross-binutils-2.14.90.0.6.oe
@@ -3,20 +3,9 @@ PROVIDES = virtual/${OLDARCH}-${OLDOS}-binutils
 SRC_URI = http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.gz
 S = ${WORKDIR}/binutils-${PV}
 
-OLDOS := ${OS}
-OLDARCH := ${ARCH}
 CROSS_DIR := ${CROSS_DIR}
-inherit noncross autotools
-
-do_configure() {
-	./configure --prefix=${CROSS_DIR} --target=${OLDARCH}-${OLDOS}
-}
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+inherit cross autotools
 
 EXTRA_OEMAKE =
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake install
-}
diff --git a/content/cross-binutils-2.14.oe b/content/cross-binutils-2.14.oe
index 7fcdfd77d3..d697538f24 100644
--- a/content/cross-binutils-2.14.oe
+++ b/content/cross-binutils-2.14.oe
@@ -8,20 +8,9 @@ PROVIDES="virtual/${ARCH}-${OS}-binutils"
 SRC_URI="${GNU_MIRROR}/binutils/binutils-${PV}.tar.gz"
 S = ${WORKDIR}/binutils-${PV}
 
-OLDOS := ${OS}
-OLDARCH := ${ARCH}
 CROSS_DIR := ${CROSS_DIR}
-inherit noncross autotools
-
-do_configure() {
-	./configure --prefix=${CROSS_DIR} --target=${OLDARCH}-${OLDOS}
-}
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+inherit cross autotools
 
 EXTRA_OEMAKE =
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake install
-}
diff --git a/content/cross-gcc-3.3.1.oe b/content/cross-gcc-3.3.1.oe
index a2022ee26b..4915a13f54 100644
--- a/content/cross-gcc-3.3.1.oe
+++ b/content/cross-gcc-3.3.1.oe
@@ -3,27 +3,21 @@ PROVIDES="virtual/${OLDARCH}-${OLDOS}-gcc"
 SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}.tar.gz
 S = ${WORKDIR}/gcc-${PV}
 
-OLDOS := ${OS}
-OLDARCH := ${ARCH}
 CROSS_DIR := ${CROSS_DIR}
-inherit noncross autotools
+prefix=${CROSS_DIR}
+exec_prefix=${prefix}
+inherit cross autotools
 
-EXTRA_OECONF = --with-gxx-include-dir=${CROSS_DIR}/include/c++ \
-		--enable-shared \
-		--enable-threads
+EXTRA_OEMAKE =
+EXTRA_OECONF = --oldincludedir=${prefix}/include --enable-shared \
+	       --with-gxx-include-dir=${CROSS_DIR}/include/c++ \
+	       --enable-shared \
+	       --enable-threads
 tmake_file = gcc/config/${OLDARCH}/t-linux
 
-do_configure() {
-	./configure --target=${OLDARCH}-${OLDOS} --prefix=${CROSS_DIR} \
-		    --with-gnu-ld --oldincludedir=${CROSS_DIR}/include \
-		    --enable-shared ${EXTRA_OECONF}	
+do_configure_append() {
 	touch ${tmake_file}
 	mv ${tmake_file} > ${tmake_file}.tmp
 	cat ${tmake_file}.tmp | sed -e's/-Dinhibit_libc -D__gthr_posix_h//g' > ${tmake_file}
 	rm -f ${tmake_file}.tmp
 }
-
-EXTRA_OEMAKE =
-do_compile() {
-	oe_runmake
-}
diff --git a/content/cross-gcc-initial-3.3.1.oe b/content/cross-gcc-initial-3.3.1.oe
index e69de29bb2..573410ee30 100644
--- a/content/cross-gcc-initial-3.3.1.oe
+++ b/content/cross-gcc-initial-3.3.1.oe
@@ -0,0 +1,16 @@
+include cross-gcc-${PV}.oe
+PN:=${PN}-initial
+
+EXTRA_OECONF = --oldincludedir=${prefix}/include --enable-shared \
+	       --enable-languages=c \
+	       --disable-shared \
+	       --disable-threads
+
+do_configure_append () {
+	if (grep -q TARGET_LIBGCC2_CFLAGS ${tmake_file}); then
+		perl -pi -e 's/^(TARGET_LIBGCC2_CFLAGS.*)/$$1 -Dinhibit_libc -D__gthr_posix_h/' ${tmake_file}
+	else
+		echo 'TARGET_LIBGCC2_CFLAGS = -Dinhibit_libc -D__gthr_posix_h' >> ${tmake_file}
+	fi
+	echo 'T_CFLAGS = -Dinhibit_libc -D__gthr_posix_h' >> ${tmake_file}
+}
diff --git a/content/fakeroot-0.7.5.oe b/content/fakeroot-0.7.5.oe
index 147be45dc2..f031a529ad 100644
--- a/content/fakeroot-0.7.5.oe
+++ b/content/fakeroot-0.7.5.oe
@@ -1,4 +1,4 @@
 SRC_URI := ${DEBIAN_MIRROR}/main/f/fakeroot/${PN}_${PV}.tar.gz
-S := ${WORKDIR}/${P}
+S = ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/content/fakeroot-buildarch-0.7.5.oe b/content/fakeroot-buildarch-0.7.5.oe
index f05ce23318..ba44127844 100644
--- a/content/fakeroot-buildarch-0.7.5.oe
+++ b/content/fakeroot-buildarch-0.7.5.oe
@@ -1,4 +1,4 @@
-inherit noncross
+inherit native
 include fakeroot-${PV}.oe
-S := ${S}
-PN=fakeroot-buildarch
+PN_append=-buildarch
+S = ${WORKDIR}/fakeroot-${PV}
diff --git a/content/ipkg-buildarch-0.99.84.oe b/content/ipkg-buildarch-0.99.84.oe
index e69de29bb2..f4750147ca 100644
--- a/content/ipkg-buildarch-0.99.84.oe
+++ b/content/ipkg-buildarch-0.99.84.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg-${PV}.oe
diff --git a/content/ipkg-buildarch-0.99.91.oe b/content/ipkg-buildarch-0.99.91.oe
index e69de29bb2..f4750147ca 100644
--- a/content/ipkg-buildarch-0.99.91.oe
+++ b/content/ipkg-buildarch-0.99.91.oe
@@ -0,0 +1,2 @@
+inherit native
+include ipkg-${PV}.oe
diff --git a/content/ipkg-utils-1.0_cvs.oe b/content/ipkg-utils-1.0_cvs.oe
index eaad1bf645..f28a6bf3dd 100644
--- a/content/ipkg-utils-1.0_cvs.oe
+++ b/content/ipkg-utils-1.0_cvs.oe
@@ -6,8 +6,8 @@ MAINTAINER="Chris Larson <kergoth@handhelds.org>"
 LICENSE="GPL"
 #DEPENDS=virtual/libc
 
-SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=ipkg-utils"
-S="${WORKDIR}/${PN}"
+SRC_URI:="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=ipkg-utils"
+S:="${WORKDIR}/${PN}"
 
 inherit autotools
 
diff --git a/content/ipkg-utils-buildarch-1.0_cvs.oe b/content/ipkg-utils-buildarch-1.0_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/ipkg-utils-buildarch-1.0_cvs.oe
diff --git a/content/mtd-buildarch.oe b/content/mtd-buildarch.oe
index e69de29bb2..4839c9cf68 100644
--- a/content/mtd-buildarch.oe
+++ b/content/mtd-buildarch.oe
@@ -0,0 +1,11 @@
+inherit native
+include mtd.oe
+PN=mtd-buildarch
+
+do_stage () {
+	for binary in ftl_format erase eraseall nanddump doc_loadbios \
+		mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
+		fcp nandwrite jffs2dump; do
+		install -m 0755 $binary ${STAGING_BINDIR}/
+	done
+}