summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-03 00:23:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-03 14:13:28 +0100
commit2c20a915c80c0fc6a06791f16650d3b184b9d618 (patch)
tree4350b6e4712f126f6cec8e4e87869259a9820cc8
parent4fbc283c00494803d93c02a6828f27e2c713d26d (diff)
downloadpoky-2c20a915c80c0fc6a06791f16650d3b184b9d618.tar.gz
gdb: build with expat, add missing RRECOMMENDS_gdbserver
* Fixes communication between gdbserver and gdb-cross by using the same expat settings for both recipes. * Adds missing build dependencies for expat/expat-native. * Adds missing glibc-thread-db runtime recommendation to gdbserver, which was set only for gdb. (From OE-Core rev: 38ee88e3b32b7444d7f1eb64f1b4f69a48fe0458) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc8
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb1
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.4.bb1
4 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 0833a030d4..a8fca6f681 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "gdb - GNU debugger"
2HOMEPAGE = "http://www.gnu.org/software/gdb/" 2HOMEPAGE = "http://www.gnu.org/software/gdb/"
3LICENSE="GPLv3+" 3LICENSE="GPLv3+"
4SECTION = "devel" 4SECTION = "devel"
5DEPENDS = "ncurses readline ${LTTNGUST}" 5DEPENDS = "expat ncurses readline ${LTTNGUST}"
6 6
7LTTNGUST = "lttng-ust" 7LTTNGUST = "lttng-ust"
8LTTNGUST_libc-uclibc = "" 8LTTNGUST_libc-uclibc = ""
@@ -11,7 +11,7 @@ LTTNGUST_mipsel = ""
11LTTNGUST_mips64 = "" 11LTTNGUST_mips64 = ""
12LTTNGUST_mips64el = "" 12LTTNGUST_mips64el = ""
13 13
14INC_PR = "r6" 14INC_PR = "r7"
15 15
16LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 16LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
17 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ 17 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -36,7 +36,7 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
36 36
37EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" 37EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
38 38
39EXPAT = "--without-expat" 39EXPAT = "--with-expat"
40 40
41EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ 41EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
42 --with-curses --disable-multilib --with-system-readline --disable-sim \ 42 --with-curses --disable-multilib --with-system-readline --disable-sim \
@@ -63,4 +63,6 @@ do_install_append() {
63 63
64RRECOMMENDS_gdb_append_linux = " glibc-thread-db " 64RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
65RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " 65RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
66RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db "
67RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db "
66 68
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
index 8e68c75782..b2f39ce9d3 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
@@ -4,6 +4,5 @@ require gdb-cross-canadian.inc
4PR = "${INC_PR}.5" 4PR = "${INC_PR}.5"
5 5
6GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 6GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
7EXPAT = "--with-expat"
8 7
9S = "${WORKDIR}/${BPN}-${PV}" 8S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index 20db86b563..588a208d94 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
@@ -1,6 +1,6 @@
1require gdb-common.inc 1require gdb-common.inc
2 2
3DEPENDS = "ncurses-native" 3DEPENDS = "expat-native ncurses-native"
4 4
5#EXTRA_OEMAKE += "LDFLAGS='${BUILD_LDFLAGS}'" 5#EXTRA_OEMAKE += "LDFLAGS='${BUILD_LDFLAGS}'"
6 6
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.4.bb b/meta/recipes-devtools/gdb/gdb-cross_7.4.bb
index eaf8f36b06..a14d0ba952 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.4.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.4.bb
@@ -1,7 +1,6 @@
1require gdb-cross.inc 1require gdb-cross.inc
2 2
3SRC_URI += "file://sim-install-6.6.patch" 3SRC_URI += "file://sim-install-6.6.patch"
4EXPAT = "--with-expat"
5 4
6PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
7 6