From 53f22c9b8befdeed7934bcf107e39d15a04a2326 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 11 Aug 2010 15:52:33 +0100
Subject: gdb: Make sure expat is not accidentally included

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/gdb/gdb-common.inc            | 4 +++-
 meta/packages/gdb/gdb-cross-canadian_7.1.bb | 1 +
 meta/packages/gdb/gdb_7.1.bb                | 2 +-
 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"
-- 
cgit v1.2.3