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

into forsteri.amd.com:/users/jcrouse/bk/oe/packages

2004/09/15 17:22:03-07:00 amd.com!jcrouse
Fix GDB to play well with 64 bit envs

BKrev: 4148dcb6TlEnxlB0M-bDnkt3wAI0tw

diff --git a/gdb/gdb_6.2.oe b/gdb/gdb_6.2.oe
index 661bde8..5fba6eb 100644 (file)
--- a/gdb/gdb_6.2.oe
+++ b/gdb/gdb_6.2.oe
@@ -1,12 +1,10 @@
 DESCRIPTION = "gdb - GNU debugger"
+LICENSE="GPL"
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 
-PACKAGES =+ 'gdbserver '
-FILES_gdbserver = '${bindir}/gdbserver'
-
 inherit autotools
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
@@ -23,24 +21,24 @@ export CFLAGS_append=" -L${STAGING_LIBDIR}"
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-nls \
-                --with-curses --with-readline --disable-sim \
+                --with-curses --disable-multilib --with-readline --disable-sim \
                 --program-prefix=''"
 
+S = "${WORKDIR}/gdb-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
-       gnu-configize
-       oe_runconf
+       (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        CPPFLAGS="" oe_runconf
 }
 
 do_install () {
-       make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
        oe_runmake install \
-           'prefix=${D}/${prefix}' 'exec_prefix=${D}/${prefix}' 'bindir=${D}/${bindir}' \
-           'sbindir=${D}/${sbindir}' 'infodir=${D}/${datadir}/info' 'libdir=${D}/${libdir}' \
-           'mandir=${D}/${mandir}' 'includedir=${D}/${includedir}'
-       install -d ${D}${bindir}
-       install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
+           'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}/bin' \
+           'sbindir=${D}/sbin' 'infodir=${D}/share/info' 'libdir=${D}/lib' \
+           'mandir=${D}/share/man' 'includedir=${D}/include'
 }
 
 #