gdb: Sync with poky (metadata cleanups, addition of gdb-cross-sdk)

diff --git a/packages/gdb/gdb-common.inc b/packages/gdb/gdb-common.inc
new file mode 100644 (file)
index 0000000..0c23692
--- /dev/null
+++ b/packages/gdb/gdb-common.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/packages/gdb/gdb-cross-sdk_6.6.bb b/packages/gdb/gdb-cross-sdk_6.6.bb
new file mode 100644 (file)
index 0000000..b963489
--- /dev/null
+++ b/packages/gdb/gdb-cross-sdk_6.6.bb
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+inherit sdk
+
+do_stage() {
+       :
+}

diff --git a/packages/gdb/gdb-cross.inc b/packages/gdb/gdb-cross.inc
index 33ca380..480cce4 100644 (file)
--- a/packages/gdb/gdb-cross.inc
+++ b/packages/gdb/gdb-cross.inc
@@ -1,25 +1,18 @@
-DESCRIPTION = "gdb - GNU debugger"
-HOMEPAGE = "http://www.gnu.org/software/gdb/"
-LICENSE="GPL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses-native"
-
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz"
-
-S = "${WORKDIR}/gdb-${PV}"
-
-inherit autotools sdk
+require gdb-common.inc
 
-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}"
+DEPENDS = "ncurses-native"
 
 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/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb
index 5419872..5b27e09 100644 (file)
--- a/packages/gdb/gdb-cross_6.3.bb
+++ b/packages/gdb/gdb-cross_6.3.bb
@@ -1,19 +1,8 @@
 require gdb-cross.inc
 
-PR = "r1"
+inherit cross
+
+PR = "r3"
 
 SRC_URI += "file://sim-install-makefile.patch;patch=1 \
        file://sim-install-makefile-common.patch;patch=1"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-       gnu-configize
-       oe_runconf
-}
-
-do_stage() {
-       oe_runmake 'DESTDIR=${CROSS_DIR}' install
-       cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
-       rm -rf ${CROSS_DIR}${prefix}
-}

diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb
index 2f93e6b..e4946b0 100644 (file)
--- a/packages/gdb/gdb-cross_6.4.bb
+++ b/packages/gdb/gdb-cross_6.4.bb
@@ -1,14 +1,5 @@
 require gdb-cross.inc
 
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-        gnu-configize
-        oe_runconf
-}
+inherit cross
 
-do_stage() {
-        oe_runmake 'DESTDIR=${CROSS_DIR}' install
-        cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
-        rm -rf ${CROSS_DIR}${prefix}
-}
+PR = "r1"
\ No newline at end of file

diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb
index f32ee32..c6992e4 100644 (file)
--- a/packages/gdb/gdb-cross_6.6.bb
+++ b/packages/gdb/gdb-cross_6.6.bb
@@ -1,16 +1,7 @@
 require gdb-cross.inc
 
-PR = "r1"
+SRC_URI += "file://sim-install-6.6.patch;patch=1"
 
-SRC_URI += "file://sim-install-makefile.patch;patch=1"
+inherit cross
 
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-       gnu-configize
-       oe_runconf
-}
-
-do_stage() {
-       :       
-}
+PR = "r1"
\ No newline at end of file

diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc
index 7eeda45..d3b9d86 100644 (file)
--- a/packages/gdb/gdb.inc
+++ b/packages/gdb/gdb.inc
@@ -1,41 +1,31 @@
-DESCRIPTION = "gdb - GNU debugger"
-HOMEPAGE = "http://www.gnu.org/software/gdb/"
-LICENSE="GPL"
-SECTION = "devel"
-PRIORITY = "optional"
+require gdb-common.inc
 
 DEPENDS = "ncurses readline"
 
-PACKAGES =+ 'gdbserver '
-FILES_gdbserver = '${bindir}/gdbserver'
+PACKAGES =+ "gdbserver"
+FILES_gdbserver = "${bindir}/gdbserver"
 
-inherit autotools gettext
+RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
+RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.bz2 \
+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 \
-          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}"
+LDFLAGS_append = " -s"
+export CFLAGS_append=" -L${STAGING_LIBDIR}"
 
 do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
+       # 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
 }
@@ -46,3 +36,5 @@ do_install () {
        install -d ${D}${bindir}
        install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
+
+

diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index e5b0552..a558775 100644 (file)
--- a/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@ -1,4 +1,3 @@
 require gdb.inc
 
-RDEPENDS_openmn = "libthread-db1"
-PR = "r2"
+PR = "r3"

diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
index e5d2b2a..de6bcf3 100644 (file)
--- a/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-RDEPENDS_openmn = "libthread-db1"
+PR = "r1"
\ No newline at end of file

diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb
index 3650b92..a558775 100644 (file)
--- a/packages/gdb/gdb_6.6.bb
+++ b/packages/gdb/gdb_6.6.bb
@@ -1,7 +1,3 @@
 require gdb.inc
 
-PR = "r2"
-
-#only append it for glib, not for uclibc
-RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
-RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
+PR = "r3"