Merge openembedded@openembedded.bkbits.net:packages

into doomcom.org:/home/gbritton/devel/OE/packages

2004/04/20 20:34:22-04:00 doomcom.org!gbritton
fix uclibc toolchain building

BKrev: 4085c2ad39OHCa1M5jwvNQD62UxrYw

11 files changed, 30 insertions, 4 deletions

diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 0f971d19bc..3f2faa778a 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -46,7 +46,9 @@ SRC_URI = "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix}"
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX}"
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = "configure-build-libiberty all"
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 0f971d19bc..3f2faa778a 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -46,7 +46,9 @@ SRC_URI = "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix}"
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX}"
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = "configure-build-libiberty all"
diff --git a/binutils/binutils_2.14.90.0.8.oe b/binutils/binutils_2.14.90.0.8.oe
index 6de08075a2..9c5b489804 100644
--- a/binutils/binutils_2.14.90.0.8.oe
+++ b/binutils/binutils_2.14.90.0.8.oe
@@ -45,7 +45,9 @@ SRC_URI = "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix}"
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX}"
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = "configure-build-libiberty all"
diff --git a/binutils/binutils_2.15.90.0.1.oe b/binutils/binutils_2.15.90.0.1.oe
index 6de08075a2..9c5b489804 100644
--- a/binutils/binutils_2.15.90.0.1.oe
+++ b/binutils/binutils_2.15.90.0.1.oe
@@ -45,7 +45,9 @@ SRC_URI = "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix}"
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX}"
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = "configure-build-libiberty all"
diff --git a/gcc/gcc-3.3.3/gcc-uclibc-3.3-100-conf.patch b/gcc/gcc-3.3.3/gcc-uclibc-3.3-100-conf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.3.3/gcc-uclibc-3.3-100-conf.patch
diff --git a/gcc/gcc-3.3.3/gcc-uclibc-3.3-110-conf.patch b/gcc/gcc-3.3.3/gcc-uclibc-3.3-110-conf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.3.3/gcc-uclibc-3.3-110-conf.patch
diff --git a/gcc/gcc-3.3.3/gcc-uclibc-3.3-120-softfloat.patch b/gcc/gcc-3.3.3/gcc-uclibc-3.3-120-softfloat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.3.3/gcc-uclibc-3.3-120-softfloat.patch
diff --git a/gcc/gcc-3.3.3/gcc-uclibc-3.3-200-code.patch b/gcc/gcc-3.3.3/gcc-uclibc-3.3-200-code.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.3.3/gcc-uclibc-3.3-200-code.patch
diff --git a/gcc/gcc-uclibc_3.3.3.oe b/gcc/gcc-uclibc_3.3.3.oe
index cdcfed787b..390a0a217f 100644
--- a/gcc/gcc-uclibc_3.3.3.oe
+++ b/gcc/gcc-uclibc_3.3.3.oe
@@ -28,6 +28,13 @@ FILES_uclibc-libstdc++-dev = "${includedir}/c++/${PV}-uclibc \
 			      ${libdir}/libsupc++.la \
 			      ${libdir}/libsupc++.a"
 
+# Additional patches
+SRC_URI_append = " \
+	file://${FILESDIR}/gcc-uclibc-3.3-100-conf.patch;patch=1 \
+	file://${FILESDIR}/gcc-uclibc-3.3-110-conf.patch;patch=1 \
+	file://${FILESDIR}/gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
+	file://${FILESDIR}/gcc-uclibc-3.3-200-code.patch;patch=1"
+
 EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV}-uclibc \
                 --enable-target-optspace \
diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
index 935e23d5c2..4a2327960f 100644
--- a/uclibc/uclibc-initial_0.9.26.oe
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -1,6 +1,12 @@
 include uclibc_${PV}.oe
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
+
+# This will ONLY build to this target
+TARGET_VENDOR = "-uclibc"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
+
 DEPENDS = ""
 PACKAGES = ""
 
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index ae07a6aec6..2cbdc38079 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -4,6 +4,11 @@ SECTION = "libs"
 PRIORITY = "required"
 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}-"
+
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc-initial"