Merge openembedded@openembedded.bkbits.net:packages-devel

into handhelds.org:/home/kergoth/code/packages

2004/11/20 19:31:58-05:00 handhelds.org!kergoth
Unbork the libgcc_s.so symlink in the gcc package.

BKrev: 419fe20db1Si3mEBa7EV4K4nIGbJ5Q

8 files changed, 51 insertions, 3 deletions

diff --git a/gcc/gcc-cross_3.4.0.oe b/gcc/gcc-cross_3.4.0.oe
index 4fadc573f2..66b958d7d1 100644
--- a/gcc/gcc-cross_3.4.0.oe
+++ b/gcc/gcc-cross_3.4.0.oe
@@ -1,6 +1,9 @@
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/gcc/gcc-cross_3.4.1.oe b/gcc/gcc-cross_3.4.1.oe
index 4fadc573f2..66b958d7d1 100644
--- a/gcc/gcc-cross_3.4.1.oe
+++ b/gcc/gcc-cross_3.4.1.oe
@@ -1,6 +1,9 @@
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/gcc/gcc-cross_3.4.2.oe b/gcc/gcc-cross_3.4.2.oe
index 4fadc573f2..66b958d7d1 100644
--- a/gcc/gcc-cross_3.4.2.oe
+++ b/gcc/gcc-cross_3.4.2.oe
@@ -1,6 +1,9 @@
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/gcc/gcc-cross_3.4.3.oe b/gcc/gcc-cross_3.4.3.oe
index e69de29bb2..66b958d7d1 100644
--- a/gcc/gcc-cross_3.4.3.oe
+++ b/gcc/gcc-cross_3.4.3.oe
@@ -0,0 +1,14 @@
+include gcc_${PV}.oe
+inherit cross
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR.  If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r2"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+
+include gcc3-cross-build.inc
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index 4b7f9322dc..61fd3cba3a 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/gcc/gcc_3.4.1.oe b/gcc/gcc_3.4.1.oe
index 4b7f9322dc..61fd3cba3a 100644
--- a/gcc/gcc_3.4.1.oe
+++ b/gcc/gcc_3.4.1.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/gcc/gcc_3.4.2.oe b/gcc/gcc_3.4.2.oe
index 4b7f9322dc..61fd3cba3a 100644
--- a/gcc/gcc_3.4.2.oe
+++ b/gcc/gcc_3.4.2.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/gcc/gcc_3.4.3.oe b/gcc/gcc_3.4.3.oe
index e69de29bb2..9445be099b 100644
--- a/gcc/gcc_3.4.3.oe
+++ b/gcc/gcc_3.4.3.oe
@@ -0,0 +1,25 @@
+PR = "r3"
+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>"
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools gettext
+
+include gcc-package.inc
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-arm-ldm.patch;patch=1 \
+	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
+	   file://gcc34-arm-tune.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
+	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
+	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
+
+include gcc3-build.inc