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

into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/11/14 16:02:53-05:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages-devel
into handhelds.org:/home/kergoth/code/packages

2004/11/14 16:02:44-05:00 handhelds.org!kergoth
* gcc_3.4.2.oe: Hack the specs file for the native toolchain to disable
  cross_compile.
* binutils_2.15.91.0.2.oe: Don't set --with-sysroot, to unbork linking with
  the native toolchain.

BKrev: 4197cb2blUM7Kp0ZCSPH0wQh-BltMQ

diff --git a/binutils/binutils_2.15.91.0.2.oe b/binutils/binutils_2.15.91.0.2.oe
index 2dceb19..99db09d 100644 (file)
--- a/binutils/binutils_2.15.91.0.2.oe
+++ b/binutils/binutils_2.15.91.0.2.oe
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -50,8 +50,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
-               --disable-nls \
+EXTRA_OECONF = "--disable-nls \
                --program-prefix=${TARGET_PREFIX} \
                --enable-shared"
 

diff --git a/gcc/gcc_3.4.2.oe b/gcc/gcc_3.4.2.oe
index dc15ba8..9c994bb 100644 (file)
--- a/gcc/gcc_3.4.2.oe
+++ b/gcc/gcc_3.4.2.oe
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
@@ -148,6 +148,9 @@ do_install () {
        rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
        rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
 
+       # Hack around specs file assumptions
+       sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/specs
+
        # Move libgcc_s into /lib
        mkdir -p ${D}/lib
        mv ${D}/${libdir}/libgcc_s.so.* ${D}/lib