gdb: Clean up recipe and don't inherit cross for cross-canadian

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

6 files changed, 31 insertions, 39 deletions

diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index 266c8fe6b2..49231a525d 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdb/"
 LICENSE="GPLv3+"
 SECTION = "devel"
 PRIORITY = "optional"
+DEPENDS = "ncurses readline"
 
 inherit autotools
 
@@ -18,3 +19,23 @@ export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
+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 \
+                ${GDBPROPREFIX}"
+GDBPROPREFIX = "--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"
+        oe_runconf
+}
+
+PACKAGES =+ "gdbserver"
+FILES_gdbserver = "${bindir}/gdbserver"
+
+RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
+RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
+
diff --git a/meta/packages/gdb/gdb-cross-canadian_6.8.bb b/meta/packages/gdb/gdb-cross-canadian_6.8.bb
index badcba2533..5de6547f85 100644
--- a/meta/packages/gdb/gdb-cross-canadian_6.8.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_6.8.bb
@@ -1,5 +1,7 @@
-require gdb-cross.inc
+require gdb-common.inc
 
 DEPENDS = "ncurses-nativesdk expat-nativesdk"
 
 inherit cross-canadian
+
+PR = "r8"
diff --git a/meta/packages/gdb/gdb-cross.inc b/meta/packages/gdb/gdb-cross.inc
index 1618c80bec..11784e0d2b 100644
--- a/meta/packages/gdb/gdb-cross.inc
+++ b/meta/packages/gdb/gdb-cross.inc
@@ -2,15 +2,8 @@ require gdb-common.inc
 
 DEPENDS = "ncurses-native"
 
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
+#EXTRA_OEMAKE += "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
-}
+GDBPROPREFIX = ""
 
 inherit cross
diff --git a/meta/packages/gdb/gdb-cross_6.8.bb b/meta/packages/gdb/gdb-cross_6.8.bb
index 8462b6cb86..19c2da23f8 100644
--- a/meta/packages/gdb/gdb-cross_6.8.bb
+++ b/meta/packages/gdb/gdb-cross_6.8.bb
@@ -1,7 +1,5 @@
 require gdb-cross.inc
 
-inherit cross
-
 SRC_URI += "file://sim-install-6.6.patch;patch=1"
 
-PR = "r2"
+PR = "r3"
diff --git a/meta/packages/gdb/gdb.inc b/meta/packages/gdb/gdb.inc
index 8c9bfa7267..e1acceb2f6 100644
--- a/meta/packages/gdb/gdb.inc
+++ b/meta/packages/gdb/gdb.inc
@@ -1,33 +1,11 @@
 require gdb-common.inc
 
-DEPENDS = "ncurses readline"
-
-PACKAGES =+ "gdbserver"
-FILES_gdbserver = "${bindir}/gdbserver"
-
-RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
-RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
-
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
             file://gdbserver-cflags-last.diff;patch=1;pnum=0 \
-                        file://ignore_whitespace_changes.patch;patch=1 "
-#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}"
+            file://ignore_whitespace_changes.patch;patch=1 "
 
-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
-}
+#LDFLAGS_append = " -s"
+#export CFLAGS_append=" -L${STAGING_LIBDIR}"
 
diff --git a/meta/packages/gdb/gdb_6.8.bb b/meta/packages/gdb/gdb_6.8.bb
index 5c395650cb..6495d6cdca 100644
--- a/meta/packages/gdb/gdb_6.8.bb
+++ b/meta/packages/gdb/gdb_6.8.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-PR = "r5"
+PR = "r7"