summaryrefslogtreecommitdiff
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
parentf05fd8dc5cc197635690d89c767fee7a8236897e (diff)
downloadopenembedded-core-53f22c9b8befdeed7934bcf107e39d15a04a2326.tar.gz
openembedded-core-53f22c9b8befdeed7934bcf107e39d15a04a2326.tar.bz2
openembedded-core-53f22c9b8befdeed7934bcf107e39d15a04a2326.tar.xz
openembedded-core-53f22c9b8befdeed7934bcf107e39d15a04a2326.zip
gdb: Make sure expat is not accidentally included
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-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 fcd911ab0..d3bda85e1 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -21,9 +21,11 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
+EXPAT = "--without-expat"
+
EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
--with-curses --disable-multilib --with-readline --disable-sim \
- ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET}"
+ ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
GDBPROPREFIX = "--program-prefix=''"
do_configure () {
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
index 7a677540e..5982c0568 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
PR = "r0"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
+EXPAT = "--with-expat"
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/packages/gdb/gdb_7.1.bb
index ec413a139..5b8f3769b 100644
--- a/meta/packages/gdb/gdb_7.1.bb
+++ b/meta/packages/gdb/gdb_7.1.bb
@@ -1,3 +1,3 @@
require gdb.inc
-PR = "r0"
+PR = "r1"