summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-11 15:52:33 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-12 14:41:29 +0100
commit53f22c9b8befdeed7934bcf107e39d15a04a2326 (patch)
treedfeaf0f3ecbfa148731d3c3a726f81f0ade727fb /meta/packages
parentf05fd8dc5cc197635690d89c767fee7a8236897e (diff)
downloadpoky-53f22c9b8befdeed7934bcf107e39d15a04a2326.tar.gz
gdb: Make sure expat is not accidentally included
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gdb/gdb-common.inc4
-rw-r--r--meta/packages/gdb/gdb-cross-canadian_7.1.bb1
-rw-r--r--meta/packages/gdb/gdb_7.1.bb2
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index fcd911ab0a..d3bda85e1d 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -21,9 +21,11 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
21 21
22EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" 22EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
23 23
24EXPAT = "--without-expat"
25
24EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ 26EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
25 --with-curses --disable-multilib --with-readline --disable-sim \ 27 --with-curses --disable-multilib --with-readline --disable-sim \
26 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET}" 28 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
27GDBPROPREFIX = "--program-prefix=''" 29GDBPROPREFIX = "--program-prefix=''"
28 30
29do_configure () { 31do_configure () {
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
index 7a677540e2..5982c0568e 100644
--- a/meta/packages/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
@@ -7,3 +7,4 @@ inherit cross-canadian
7PR = "r0" 7PR = "r0"
8 8
9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
10EXPAT = "--with-expat"
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/packages/gdb/gdb_7.1.bb
index ec413a1397..5b8f3769bd 100644
--- a/meta/packages/gdb/gdb_7.1.bb
+++ b/meta/packages/gdb/gdb_7.1.bb
@@ -1,3 +1,3 @@
1require gdb.inc 1require gdb.inc
2 2
3PR = "r0" 3PR = "r1"