Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

2 files changed, 43 insertions, 43 deletions

diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 4f30cb5c21..1f9ae2b4e3 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -48,40 +48,40 @@ FILES_${PN}-doc = "${infodir} \
 		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
 
 SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://${FILESDIR}/config.sub.patch;patch=1 \
-	   file://${FILESDIR}/empty6.patch;patch=1 \
-	   file://${FILESDIR}/pr10392-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr10412-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr10589-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr11162-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr11587-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr11608.patch;patch=1 \
-	   file://${FILESDIR}/pr11736-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr11864-1-test.patch;patch=1 \
-	   file://${FILESDIR}/pr12009.patch;patch=1 \
-	   file://${FILESDIR}/pr12010.patch;patch=1 \
-	   file://${FILESDIR}/pr13260-test.patch;patch=1 \
-	   file://${FILESDIR}/pr9365-1-test.patch;patch=1 \
-	   file://${FILESDIR}/sh-lib1funcs_sizeAndType.patch;patch=1 \
-	   file://${FILESDIR}/sh-pic-set_fpscr-gcc-3.3.2.patch;patch=1 \
-	   file://${FILESDIR}/thunk3.patch;patch=1 \
-	   file://${FILESDIR}/arm-10730.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-12527.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-14558.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-common.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-gotoff.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-ldm.dpatch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-tune.patch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-xscale.patch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-14302.patch;patch=1;pnum=0 \
-	   file://${FILESDIR}/arm-ldm-peephole.patch;patch=1;pnum=0 \
-	   file://${FILESDIR}/libibery-crosstool.patch;patch=1;pnum=1 \
-	   file://${FILESDIR}/reverse-compare.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-15089.patch;patch=1 \
-	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"
+	   file://config.sub.patch;patch=1 \
+	   file://empty6.patch;patch=1 \
+	   file://pr10392-1-test.patch;patch=1 \
+	   file://pr10412-1-test.patch;patch=1 \
+	   file://pr10589-1-test.patch;patch=1 \
+	   file://pr11162-1-test.patch;patch=1 \
+	   file://pr11587-1-test.patch;patch=1 \
+	   file://pr11608.patch;patch=1 \
+	   file://pr11736-1-test.patch;patch=1 \
+	   file://pr11864-1-test.patch;patch=1 \
+	   file://pr12009.patch;patch=1 \
+	   file://pr12010.patch;patch=1 \
+	   file://pr13260-test.patch;patch=1 \
+	   file://pr9365-1-test.patch;patch=1 \
+	   file://sh-lib1funcs_sizeAndType.patch;patch=1 \
+	   file://sh-pic-set_fpscr-gcc-3.3.2.patch;patch=1 \
+	   file://thunk3.patch;patch=1 \
+	   file://arm-10730.dpatch;patch=1;pnum=0 \
+	   file://arm-12527.dpatch;patch=1;pnum=0 \
+	   file://arm-14558.dpatch;patch=1;pnum=0 \
+	   file://arm-common.dpatch;patch=1;pnum=0 \
+	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
+	   file://arm-ldm.dpatch;patch=1;pnum=0 \
+	   file://arm-tune.patch;patch=1;pnum=0 \
+	   file://arm-xscale.patch;patch=1;pnum=0 \
+	   file://arm-14302.patch;patch=1;pnum=0 \
+	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
+	   file://libibery-crosstool.patch;patch=1;pnum=1 \
+	   file://reverse-compare.patch;patch=1 \
+	   file://gcc34-15089.patch;patch=1 \
+	file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
+	file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
+	file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
+	file://gcc-uclibc-3.3-200-code.patch;patch=1"
 
 MIRRORS_prepend () {
 ${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index 5b03ce6d28..8535eadac4 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -67,15 +67,15 @@ FILES_${PN}-doc = "${infodir} \
 		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://${FILESDIR}/gcc34-reverse-compare.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-pre-modify.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-arm-ldm.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-arm-tune.patch;patch=1 \
-	   file://${FILESDIR}/gcc34-15089.patch;patch=1 \
-	file://${FILESDIR}/gcc-uclibc-3.4.0-100-conf.patch;patch=1 \
-	file://${FILESDIR}/gcc-uclibc-3.4.0-120-softfloat.patch;patch=1 \
-	file://${FILESDIR}/gcc-uclibc-3.4.0-200-code.patch;patch=1"
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-pre-modify.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://gcc34-15089.patch;patch=1 \
+	file://gcc-uclibc-3.4.0-100-conf.patch;patch=1 \
+	file://gcc-uclibc-3.4.0-120-softfloat.patch;patch=1 \
+	file://gcc-uclibc-3.4.0-200-code.patch;patch=1"
 
 MIRRORS_prepend () {
 ${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/