summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Britton <gbritton@doomcom.org>2004-04-27 02:53:54 +0000
committerGerald Britton <gbritton@doomcom.org>2004-04-27 02:53:54 +0000
commit5c76c320af6f82794823215c081469d3de8e64e4 (patch)
tree324384db2b3a349459fb4fa28fc910448ec52ae7
parentf63c99c34855fff1cbb932457b08bdd29b3777ff (diff)
- binutils 2.15.90.0.3 / gcc 3.4.0 toolchain
- support in glibc and uclibc for gcc 3.4.0 - new target setup for uclibc, TARGET_OS=linux-uclibc to match the uclibc project's setup and modern config.sub already has support for it. BKrev: 408dcb42JOaGKxGg3PSn6IwU4Kimfw
-rw-r--r--autoconf/autoconf-2.59/autoconf259-update-configscripts.patch0
-rw-r--r--autoconf/autoconf_2.59.oe3
-rw-r--r--automake/automake_1.8.2.oe5
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-001_ld_makefile.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-006_better_file_error.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-009_signed_char_fix.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-200-build_modules.patch0
-rw-r--r--binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-210-cflags.patch0
-rw-r--r--binutils/binutils-cross_2.14.90.0.6.oe1
-rw-r--r--binutils/binutils-cross_2.14.90.0.7.oe1
-rw-r--r--binutils/binutils-cross_2.14.90.0.8.oe1
-rw-r--r--binutils/binutils-cross_2.15.90.0.1.oe1
-rw-r--r--binutils/binutils-cross_2.15.90.0.3.oe0
-rw-r--r--binutils/binutils-uclibc-cross_2.14.90.0.6.oe1
-rw-r--r--binutils/binutils-uclibc-cross_2.14.90.0.7.oe1
-rw-r--r--binutils/binutils-uclibc-cross_2.14.90.0.8.oe1
-rw-r--r--binutils/binutils-uclibc-cross_2.15.90.0.1.oe1
-rw-r--r--binutils/binutils-uclibc-cross_2.15.90.0.3.oe0
-rw-r--r--binutils/binutils-uclibc_2.14.90.0.6.oe5
-rw-r--r--binutils/binutils-uclibc_2.14.90.0.7.oe5
-rw-r--r--binutils/binutils-uclibc_2.14.90.0.8.oe5
-rw-r--r--binutils/binutils-uclibc_2.15.90.0.1.oe5
-rw-r--r--binutils/binutils-uclibc_2.15.90.0.3.oe0
-rw-r--r--binutils/binutils_2.14.90.0.6.oe23
-rw-r--r--binutils/binutils_2.14.90.0.7.oe23
-rw-r--r--binutils/binutils_2.14.90.0.8.oe23
-rw-r--r--binutils/binutils_2.15.90.0.1.oe23
-rw-r--r--binutils/binutils_2.15.90.0.3.oe0
-rw-r--r--conf/local.conf.sample6
-rw-r--r--gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch.orig0
-rw-r--r--gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc34-arm-ldm.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc34-arm-tune.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc34-pre-modify.patch0
-rw-r--r--gcc/gcc-3.4.0/gcc34-reverse-compare.patch0
-rw-r--r--gcc/gcc-cross-initial_3.3.2.oe0
-rw-r--r--gcc/gcc-cross-initial_3.3.3.oe0
-rw-r--r--gcc/gcc-cross-initial_3.4.0.oe0
-rw-r--r--gcc/gcc-cross_3.4.0.oe0
-rw-r--r--gcc/gcc-initial-cross_3.3.2.oe21
-rw-r--r--gcc/gcc-initial-cross_3.3.3.oe26
-rw-r--r--gcc/gcc-initial-uclibc-cross_3.3.2.oe16
-rw-r--r--gcc/gcc-initial-uclibc-cross_3.3.3.oe16
-rw-r--r--gcc/gcc-uclibc-cross-initial_3.3.2.oe0
-rw-r--r--gcc/gcc-uclibc-cross-initial_3.3.3.oe0
-rw-r--r--gcc/gcc-uclibc-cross-initial_3.4.0.oe0
-rw-r--r--gcc/gcc-uclibc-cross_3.4.0.oe0
-rw-r--r--gcc/gcc-uclibc_3.3.2.oe8
-rw-r--r--gcc/gcc-uclibc_3.3.3.oe8
-rw-r--r--gcc/gcc-uclibc_3.4.0.oe0
-rw-r--r--gcc/gcc_3.3.2.oe23
-rw-r--r--gcc/gcc_3.3.3.oe23
-rw-r--r--gcc/gcc_3.4.0.oe0
-rw-r--r--glibc/glibc-2.3.2/arm-machine-gmon.patch0
-rw-r--r--glibc/glibc-2.3.2/arm-memcpy.patch756
-rw-r--r--glibc/glibc-2.3.2/glibc232-gcc34-i386-fixup-attribute.patch0
-rw-r--r--glibc/glibc-2.3.2/glibc232-gcc34-no-unit-at-a-time.patch0
-rw-r--r--glibc/glibc-cvs/arm-machine-gmon.patch0
-rw-r--r--glibc/glibc-cvs/arm-memcpy.patch756
-rw-r--r--glibc/glibc_2.3.2.oe54
-rw-r--r--glibc/glibc_cvs.oe52
-rw-r--r--libtool/libtool-1.5/libtool15-update-configscripts.patch0
-rw-r--r--libtool/libtool-cross_1.5.oe3
-rw-r--r--libtool/libtool_1.5.oe3
-rw-r--r--uclibc/uclibc-0.9.26/uClibc.config.arm30
-rw-r--r--uclibc/uclibc-0.9.26/uClibc.config.i386154
-rw-r--r--uclibc/uclibc-initial_0.9.26.oe5
-rw-r--r--uclibc/uclibc_0.9.26.oe73
72 files changed, 1877 insertions, 284 deletions
diff --git a/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch b/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch
diff --git a/autoconf/autoconf_2.59.oe b/autoconf/autoconf_2.59.oe
index b80fe700bf..0c2ced0034 100644
--- a/autoconf/autoconf_2.59.oe
+++ b/autoconf/autoconf_2.59.oe
@@ -1,6 +1,7 @@
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
file://${FILESDIR}/program_prefix.patch;patch=1 \
- file://${FILESDIR}/autoreconf-include.patch;patch=1"
+ file://${FILESDIR}/autoreconf-include.patch;patch=1 \
+ file://${FILESDIR}/autoconf259-update-configscripts.patch;patch=1"
DESCRIPTION = "A package of M4 macros to produce scripts to \
automatically configure sourcecode."
diff --git a/automake/automake_1.8.2.oe b/automake/automake_1.8.2.oe
index 94d0da789c..ae5117d3d9 100644
--- a/automake/automake_1.8.2.oe
+++ b/automake/automake_1.8.2.oe
@@ -1,6 +1,9 @@
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+ file://${FILESDIR}/automake182-update-configscripts.patch;patch=1;pnum=1"
DESCRIPTION = "A tool for automatically generating Makefiles."
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
+
inherit autotools
do_install () {
diff --git a/binutils/binutils-2.15.90.0.3/binutils-001_ld_makefile.patch b/binutils/binutils-2.15.90.0.3/binutils-001_ld_makefile.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-001_ld_makefile.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-006_better_file_error.patch b/binutils/binutils-2.15.90.0.3/binutils-006_better_file_error.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-006_better_file_error.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-009_signed_char_fix.patch b/binutils/binutils-2.15.90.0.3/binutils-009_signed_char_fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-009_signed_char_fix.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch b/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-200-build_modules.patch b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-200-build_modules.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-200-build_modules.patch
diff --git a/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-210-cflags.patch b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-210-cflags.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-210-cflags.patch
diff --git a/binutils/binutils-cross_2.14.90.0.6.oe b/binutils/binutils-cross_2.14.90.0.6.oe
index c6daeb4f14..bcd05014fc 100644
--- a/binutils/binutils-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-cross_2.14.90.0.6.oe
@@ -1,7 +1,6 @@
include binutils_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-cross_2.14.90.0.7.oe b/binutils/binutils-cross_2.14.90.0.7.oe
index c6daeb4f14..bcd05014fc 100644
--- a/binutils/binutils-cross_2.14.90.0.7.oe
+++ b/binutils/binutils-cross_2.14.90.0.7.oe
@@ -1,7 +1,6 @@
include binutils_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-cross_2.14.90.0.8.oe b/binutils/binutils-cross_2.14.90.0.8.oe
index c6daeb4f14..bcd05014fc 100644
--- a/binutils/binutils-cross_2.14.90.0.8.oe
+++ b/binutils/binutils-cross_2.14.90.0.8.oe
@@ -1,7 +1,6 @@
include binutils_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-cross_2.15.90.0.1.oe b/binutils/binutils-cross_2.15.90.0.1.oe
index c6daeb4f14..bcd05014fc 100644
--- a/binutils/binutils-cross_2.15.90.0.1.oe
+++ b/binutils/binutils-cross_2.15.90.0.1.oe
@@ -1,7 +1,6 @@
include binutils_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-cross_2.15.90.0.3.oe b/binutils/binutils-cross_2.15.90.0.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-cross_2.15.90.0.3.oe
diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
index 31626ec9ba..6cf82282f8 100644
--- a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
@@ -1,7 +1,6 @@
include binutils-uclibc_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.7.oe b/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
index 31626ec9ba..6cf82282f8 100644
--- a/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
@@ -1,7 +1,6 @@
include binutils-uclibc_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.8.oe b/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
index 31626ec9ba..6cf82282f8 100644
--- a/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
@@ -1,7 +1,6 @@
include binutils-uclibc_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-uclibc-cross_2.15.90.0.1.oe b/binutils/binutils-uclibc-cross_2.15.90.0.1.oe
index 31626ec9ba..6cf82282f8 100644
--- a/binutils/binutils-uclibc-cross_2.15.90.0.1.oe
+++ b/binutils/binutils-uclibc-cross_2.15.90.0.1.oe
@@ -1,7 +1,6 @@
include binutils-uclibc_${PV}.oe
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS = "patcher-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/binutils/binutils-uclibc-cross_2.15.90.0.3.oe b/binutils/binutils-uclibc-cross_2.15.90.0.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-uclibc-cross_2.15.90.0.3.oe
diff --git a/binutils/binutils-uclibc_2.14.90.0.6.oe b/binutils/binutils-uclibc_2.14.90.0.6.oe
index 9b9829325f..ffe7748799 100644
--- a/binutils/binutils-uclibc_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc_2.14.90.0.6.oe
@@ -1,11 +1,6 @@
include binutils_${PV}.oe
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
-# This will ONLY build to this target
-TARGET_VENDOR = "-uclibc"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
-
binutilsbuild_do_patch () {
oenote IN binutils patch
perl -i -p -e 's,#.*define.*ELF_DYNAMIC_INTERPRETER.*".*",#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0",;' `grep -lr ELF_DYNAMIC_INTERPRETER *`
diff --git a/binutils/binutils-uclibc_2.14.90.0.7.oe b/binutils/binutils-uclibc_2.14.90.0.7.oe
index dc68bfdf21..ffe7748799 100644
--- a/binutils/binutils-uclibc_2.14.90.0.7.oe
+++ b/binutils/binutils-uclibc_2.14.90.0.7.oe
@@ -1,11 +1,6 @@
include binutils_${PV}.oe
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
-# This will ONLY build to this target
-TARGET_VENDOR := "-uclibc"
-TARGET_SYS := "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX := "${TARGET_SYS}-"
-
binutilsbuild_do_patch () {
oenote IN binutils patch
perl -i -p -e 's,#.*define.*ELF_DYNAMIC_INTERPRETER.*".*",#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0",;' `grep -lr ELF_DYNAMIC_INTERPRETER *`
diff --git a/binutils/binutils-uclibc_2.14.90.0.8.oe b/binutils/binutils-uclibc_2.14.90.0.8.oe
index dc68bfdf21..ffe7748799 100644
--- a/binutils/binutils-uclibc_2.14.90.0.8.oe
+++ b/binutils/binutils-uclibc_2.14.90.0.8.oe
@@ -1,11 +1,6 @@
include binutils_${PV}.oe
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
-# This will ONLY build to this target
-TARGET_VENDOR := "-uclibc"
-TARGET_SYS := "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX := "${TARGET_SYS}-"
-
binutilsbuild_do_patch () {
oenote IN binutils patch
perl -i -p -e 's,#.*define.*ELF_DYNAMIC_INTERPRETER.*".*",#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0",;' `grep -lr ELF_DYNAMIC_INTERPRETER *`
diff --git a/binutils/binutils-uclibc_2.15.90.0.1.oe b/binutils/binutils-uclibc_2.15.90.0.1.oe
index dc68bfdf21..ffe7748799 100644
--- a/binutils/binutils-uclibc_2.15.90.0.1.oe
+++ b/binutils/binutils-uclibc_2.15.90.0.1.oe
@@ -1,11 +1,6 @@
include binutils_${PV}.oe
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}"
-# This will ONLY build to this target
-TARGET_VENDOR := "-uclibc"
-TARGET_SYS := "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX := "${TARGET_SYS}-"
-
binutilsbuild_do_patch () {
oenote IN binutils patch
perl -i -p -e 's,#.*define.*ELF_DYNAMIC_INTERPRETER.*".*",#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0",;' `grep -lr ELF_DYNAMIC_INTERPRETER *`
diff --git a/binutils/binutils-uclibc_2.15.90.0.3.oe b/binutils/binutils-uclibc_2.15.90.0.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-uclibc_2.15.90.0.3.oe
diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 3f2faa778a..9d25471e1b 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -4,13 +4,22 @@ 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-native"
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import oe, re
+ uc_pkg = (re.search('uclibc', oe.data.getVar('PN', d, 1)) != None)
+ uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_pkg != uc_os:
+ raise oe.parse.SkipPackage("incompatible with target %s" %
+ oe.data.getVar('TARGET_OS', d, 1))
+}
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 3f2faa778a..9d25471e1b 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -4,13 +4,22 @@ 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-native"
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import oe, re
+ uc_pkg = (re.search('uclibc', oe.data.getVar('PN', d, 1)) != None)
+ uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_pkg != uc_os:
+ raise oe.parse.SkipPackage("incompatible with target %s" %
+ oe.data.getVar('TARGET_OS', d, 1))
+}
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/binutils/binutils_2.14.90.0.8.oe b/binutils/binutils_2.14.90.0.8.oe
index 9c5b489804..1489ea1df6 100644
--- a/binutils/binutils_2.14.90.0.8.oe
+++ b/binutils/binutils_2.14.90.0.8.oe
@@ -4,13 +4,22 @@ 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-native"
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import oe, re
+ uc_pkg = (re.search('uclibc', oe.data.getVar('PN', d, 1)) != None)
+ uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_pkg != uc_os:
+ raise oe.parse.SkipPackage("incompatible with target %s" %
+ oe.data.getVar('TARGET_OS', d, 1))
+}
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/binutils/binutils_2.15.90.0.1.oe b/binutils/binutils_2.15.90.0.1.oe
index 9c5b489804..1489ea1df6 100644
--- a/binutils/binutils_2.15.90.0.1.oe
+++ b/binutils/binutils_2.15.90.0.1.oe