From 8926967b79f553fe94e16c691114b32124d335db Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 10 Apr 2006 10:09:06 +0000
Subject: gcc: Remove broken csl versions replacing with a floating cvs version
 and a working 2005q3 csl release.

---
 packages/gcc/gcc-cross-initial_csl-arm-20050416.bb | 28 ----------------------
 packages/gcc/gcc-cross-initial_csl-arm-20050603.bb | 28 ----------------------
 packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb   | 28 ++++++++++++++++++++++
 packages/gcc/gcc-cross-initial_csl-arm-cvs.bb      | 28 ++++++++++++++++++++++
 packages/gcc/gcc-cross_csl-arm-20050416.bb         | 15 ------------
 packages/gcc/gcc-cross_csl-arm-20050603.bb         | 15 ------------
 packages/gcc/gcc-cross_csl-arm-2005q3.bb           | 15 ++++++++++++
 packages/gcc/gcc-cross_csl-arm-cvs.bb              | 15 ++++++++++++
 packages/gcc/gcc_csl-arm-20050416.bb               | 11 ---------
 packages/gcc/gcc_csl-arm-20050603.bb               | 13 ----------
 packages/gcc/gcc_csl-arm-2005q3.bb                 | 26 ++++++++++++++++++++
 packages/gcc/gcc_csl-arm-cvs.bb                    | 10 ++++++++
 packages/gcc/gcc_csl-arm.bb                        |  7 +++---
 13 files changed, 126 insertions(+), 113 deletions(-)
 delete mode 100644 packages/gcc/gcc-cross-initial_csl-arm-20050416.bb
 delete mode 100644 packages/gcc/gcc-cross-initial_csl-arm-20050603.bb
 create mode 100644 packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
 create mode 100644 packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
 delete mode 100644 packages/gcc/gcc-cross_csl-arm-20050416.bb
 delete mode 100644 packages/gcc/gcc-cross_csl-arm-20050603.bb
 create mode 100644 packages/gcc/gcc-cross_csl-arm-2005q3.bb
 create mode 100644 packages/gcc/gcc-cross_csl-arm-cvs.bb
 delete mode 100644 packages/gcc/gcc_csl-arm-20050416.bb
 delete mode 100644 packages/gcc/gcc_csl-arm-20050603.bb
 create mode 100644 packages/gcc/gcc_csl-arm-2005q3.bb
 create mode 100644 packages/gcc/gcc_csl-arm-cvs.bb

(limited to 'packages')

diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb b/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb
deleted file mode 100644
index 48c80864e2..0000000000
--- a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-include gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb b/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb
deleted file mode 100644
index 48c80864e2..0000000000
--- a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-include gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..48c80864e2
--- /dev/null
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -0,0 +1,28 @@
+include gcc-cross_${PV}.bb
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-newlib \
+		--disable-shared \
+		--disable-threads \
+		--disable-multilib \
+		--disable-__cxa_atexit \
+		--enable-languages=c \
+		--enable-target-optspace \
+		--program-prefix=${TARGET_PREFIX} \
+		${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+# Override the method from gcc-cross so we don't try to install libgcc
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
new file mode 100644
index 0000000000..48c80864e2
--- /dev/null
+++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
@@ -0,0 +1,28 @@
+include gcc-cross_${PV}.bb
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-newlib \
+		--disable-shared \
+		--disable-threads \
+		--disable-multilib \
+		--disable-__cxa_atexit \
+		--enable-languages=c \
+		--enable-target-optspace \
+		--program-prefix=${TARGET_PREFIX} \
+		${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+# Override the method from gcc-cross so we don't try to install libgcc
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/gcc/gcc-cross_csl-arm-20050416.bb b/packages/gcc/gcc-cross_csl-arm-20050416.bb
deleted file mode 100644
index e8df623aeb..0000000000
--- a/packages/gcc/gcc-cross_csl-arm-20050416.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-include gcc_csl-arm-20050416.bb
-# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r4"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-include gcc3-cross-build.inc
-# cross packaging
-include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-20050603.bb b/packages/gcc/gcc-cross_csl-arm-20050603.bb
deleted file mode 100644
index e815b2f9e3..0000000000
--- a/packages/gcc/gcc-cross_csl-arm-20050603.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-include gcc_csl-arm-20050603.bb
-# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r0"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-include gcc3-cross-build.inc
-# cross packaging
-include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..93c58aca53
--- /dev/null
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -0,0 +1,15 @@
+include gcc_csl-arm-2005q3.bb
+# path mangling, needed by the cross packaging
+include gcc-paths-cross.inc
+inherit cross
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r0"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# cross build
+include gcc3-cross-build.inc
+# cross packaging
+include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
new file mode 100644
index 0000000000..f83de2598d
--- /dev/null
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -0,0 +1,15 @@
+include gcc_csl-arm-cvs.bb
+# path mangling, needed by the cross packaging
+include gcc-paths-cross.inc
+inherit cross
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r0"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# cross build
+include gcc3-cross-build.inc
+# cross packaging
+include gcc-package-cross.inc
diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb
deleted file mode 100644
index 58badbb8ab..0000000000
--- a/packages/gcc/gcc_csl-arm-20050416.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include gcc_csl-arm.bb
-
-SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
-
-PR = "r3"
-
-SRCDATE = "20050416"
-OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-DEFAULT_PREFERENCE_arm-linux = "-1"
-DEFAULT_PREFERENCE_arm-linuxeabi = "1"
-
diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb
deleted file mode 100644
index e322bba647..0000000000
--- a/packages/gcc/gcc_csl-arm-20050603.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-include gcc_csl-arm.bb
-
-PV = "3.4.4+csl-arm-${SRCDATE}"
-BINV = "3.4.4"
-
-SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
-
-PR = "r0"
-
-SRCDATE = "20050603"
-OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-
-DEFAULT_PREFERENCE_arm = "-1"
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..7fa23a2438
--- /dev/null
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+BINV = "3.4.4"
+PV = "3.4.4+csl-arm-2005q3"
+PR = "r0"
+
+FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
+
+inherit autotools gettext
+
+include gcc-package.inc
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar -xvjf ./arm-2005q3-2-arm-none-linux-gnueabi/gcc-2005q3-2.tar.bz2
+}
+
+addtask unpack2 after do_unpack before do_patch
+
+include gcc3-build.inc
+
+S = "${WORKDIR}/gcc-2005q3"
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
new file mode 100644
index 0000000000..bc704d51db
--- /dev/null
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -0,0 +1,10 @@
+include gcc_csl-arm.bb
+
+PV = "3.4.4+csl-arm-${SRCDATE}"
+BINV = "3.4.4"
+
+SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index 03c6b8c19f..d437ece065 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -1,11 +1,12 @@
-PR = "r0"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PV = "3.4.3+csl-arm-${SRCDATE}"
-BINV = "3.4.3"
+BINV = "3.4.4"
+PV = "3.4.4+csl-arm-${SRCDATE}"
+PR = "r0"
+
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 DEFAULT_PREFERENCE = "-1"
 
-- 
cgit v1.2.3