4 files changed, 58 insertions, 50 deletions

diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
new file mode 100644
index 0000000000..a910feec0f
--- /dev/null
+++ b/meta/packages/gdb/gdb-common.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "gdb - GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+LICENSE="GPL"
+SECTION = "devel"z
+PRIORITY = "optional"
+
+inherit autotools
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+
+S = "${WORKDIR}/gdb-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
diff --git a/meta/packages/gdb/gdb-cross.inc b/meta/packages/gdb/gdb-cross.inc
index 3996bc6fd5..75de1cfef7 100644
--- a/meta/packages/gdb/gdb-cross.inc
+++ b/meta/packages/gdb/gdb-cross.inc
@@ -1,4 +1,4 @@
-require gdb.inc
+require gdb-common.inc
 
 DEPENDS = "ncurses-native"
 
@@ -15,6 +15,6 @@ do_configure () {
         oe_runconf
 }
 
-do_stage() {
+do_stage () {
         oe_runmake install
 }
diff --git a/meta/packages/gdb/gdb.inc b/meta/packages/gdb/gdb.inc
index 0c236925dc..d3b9d864e7 100644
--- a/meta/packages/gdb/gdb.inc
+++ b/meta/packages/gdb/gdb.inc
@@ -1,22 +1,40 @@
-DESCRIPTION = "gdb - GNU debugger"
-HOMEPAGE = "http://www.gnu.org/software/gdb/"
-LICENSE="GPL"
-SECTION = "devel"
-PRIORITY = "optional"
+require gdb-common.inc
 
-inherit autotools
+DEPENDS = "ncurses readline"
 
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz"
+PACKAGES =+ "gdbserver"
+FILES_gdbserver = "${bindir}/gdbserver"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
+RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
+RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CXX_FOR_BUILD = "${BUILD_CXX}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
-export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+inherit gettext
+
+SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
+            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
+#FIXME     file://uclibc.patch;patch=1 \
+
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
+
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
+                --with-curses --disable-multilib --with-readline --disable-sim \
+                --program-prefix=''"
+
+LDFLAGS_append = " -s"
+export CFLAGS_append=" -L${STAGING_LIBDIR}"
+
+do_configure () {
+        # override this function to avoid the autoconf/automake/aclocal/autoheader
+        # calls for now
+        (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 DESTDIR='${D}' install
+        install -d ${D}${bindir}
+        install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
+}
 
-S = "${WORKDIR}/gdb-${PV}"
-B = "${WORKDIR}/build-${TARGET_SYS}"
 
diff --git a/meta/packages/gdb/gdb_6.6.bb b/meta/packages/gdb/gdb_6.6.bb
index 58bcf94938..418e0d4d8a 100644
--- a/meta/packages/gdb/gdb_6.6.bb
+++ b/meta/packages/gdb/gdb_6.6.bb
@@ -1,38 +1,6 @@
 require gdb.inc
 
-DEPENDS = "ncurses readline"
 PR = "r0"
 
-PACKAGES =+ 'gdbserver '
-FILES_gdbserver = '${bindir}/gdbserver'
 
-RRECOMMENDS_gdb = "glibc-thread-db"
 
-inherit gettext
-
-SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
-#FIXME     file://uclibc.patch;patch=1 \
-           file://gdbserver-cflags-last.diff;patch=1;pnum=0"
-
-LDFLAGS_append = " -s"
-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 \
-                --with-curses --disable-multilib --with-readline --disable-sim \
-                --program-prefix=''"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-        (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 DESTDIR='${D}' install
-        install -d ${D}${bindir}
-        install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
-}