5 files changed, 56 insertions, 51 deletions

diff --git a/meta/packages/gdb/gdb-cross-sdk_6.6.bb b/meta/packages/gdb/gdb-cross-sdk_6.6.bb
new file mode 100644
index 0000000000..b96348959f
--- /dev/null
+++ b/meta/packages/gdb/gdb-cross-sdk_6.6.bb
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+inherit sdk
+
+do_stage() {
+        :
+}
diff --git a/meta/packages/gdb/gdb-cross.inc b/meta/packages/gdb/gdb-cross.inc
new file mode 100644
index 0000000000..3996bc6fd5
--- /dev/null
+++ b/meta/packages/gdb/gdb-cross.inc
@@ -0,0 +1,20 @@
+require gdb.inc
+
+DEPENDS = "ncurses-native"
+
+SRC_URI += "file://sim-install-6.6.patch;patch=1"
+
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
+
+EXTRA_OECONF = "--with-curses --with-readline"
+
+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"
+        oe_runconf
+}
+
+do_stage() {
+        oe_runmake install
+}
diff --git a/meta/packages/gdb/gdb-cross_6.6.bb b/meta/packages/gdb/gdb-cross_6.6.bb
index 58a2ce359f..0e65931882 100644
--- a/meta/packages/gdb/gdb-cross_6.6.bb
+++ b/meta/packages/gdb/gdb-cross_6.6.bb
@@ -1,35 +1,3 @@
-LICENSE = "GPL"
-DESCRIPTION = "gdb - GNU debugger"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses-native"
+require gdb-cross.inc
 
-inherit autotools cross
-
-S = "${WORKDIR}/gdb-${PV}"
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-        file://sim-install-6.6.patch;patch=1"
-
-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}"
-
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
-
-EXTRA_OECONF = "--with-curses --with-readline"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-        gnu-configize
-        oe_runconf
-}
-
-do_stage() {
-        oe_runmake install
-}
+inherit cross
diff --git a/meta/packages/gdb/gdb.inc b/meta/packages/gdb/gdb.inc
new file mode 100644
index 0000000000..0c236925dc
--- /dev/null
+++ b/meta/packages/gdb/gdb.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "gdb - GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+LICENSE="GPL"
+SECTION = "devel"
+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_6.6.bb b/meta/packages/gdb/gdb_6.6.bb
index 1bfe3dfecf..356df8f339 100644
--- a/meta/packages/gdb/gdb_6.6.bb
+++ b/meta/packages/gdb/gdb_6.6.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "gdb - GNU debugger"
-HOMEPAGE = "http://www.gnu.org/software/gdb/"
-LICENSE="GPL"
-SECTION = "devel"
-PRIORITY = "optional"
+require gdb.inc
+
 DEPENDS = "ncurses readline"
 PR = "r0"
 
@@ -11,30 +8,21 @@ FILES_gdbserver = '${bindir}/gdbserver'
 
 RRECOMMENDS_gdb = "glibc-thread-db"
 
-inherit autotools gettext
+inherit gettext
 
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
+SRC_URI += file://kill_arm_map_symbols.patch;patch=1 \
 #FIXME     file://uclibc.patch;patch=1 \
-           file://kill_arm_map_symbols.patch;patch=1 \
            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
 
 LDFLAGS_append = " -s"
-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}"
 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=''"
 
-S = "${WORKDIR}/gdb-${PV}"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now