summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-20 13:13:36 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-20 16:03:07 +0100
commit4cdaa1789a82a89121c0c2b91724848755f12863 (patch)
tree7382901bef130c21ed04fd6ccca11503e6bf14cd /meta/packages
parent75b57d573c8e129d3ae8821e81e76ebf4b37fbfb (diff)
downloadpoky-4cdaa1789a82a89121c0c2b91724848755f12863.tar.gz
gdb: disable installation of bfd/iberty/opcodes
Those are assumed to be provided by binutils, so we disable installation here. Without doing so, a broken libbfd.la from gdb is installed to sysroot which overrides binutils version and then hurt other packages such as oprofile also fix --with-readline to --with-system-readline Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gdb/gdb-common.inc10
-rw-r--r--meta/packages/gdb/gdb-cross-canadian_7.1.bb2
-rw-r--r--meta/packages/gdb/gdb-cross_7.1.bb2
-rw-r--r--meta/packages/gdb/gdb_7.1.bb2
4 files changed, 12 insertions, 4 deletions
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index d3bda85e1d..16b653e46e 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -24,7 +24,7 @@ EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
24EXPAT = "--without-expat" 24EXPAT = "--without-expat"
25 25
26EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ 26EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
27 --with-curses --disable-multilib --with-readline --disable-sim \ 27 --with-curses --disable-multilib --with-system-readline --disable-sim \
28 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}" 28 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
29GDBPROPREFIX = "--program-prefix=''" 29GDBPROPREFIX = "--program-prefix=''"
30 30
@@ -35,6 +35,14 @@ do_configure () {
35 oe_runconf 35 oe_runconf
36} 36}
37 37
38# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
39# right bits installed by binutils.
40do_install_append() {
41 rm -rf ${D}${libdir}
42 rm -rf ${D}${includedir}
43 rm -rf ${D}${datadir}/locale
44}
45
38RRECOMMENDS_gdb_append_linux = " glibc-thread-db " 46RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
39RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " 47RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
40 48
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
index 5982c0568e..3adcdcc284 100644
--- a/meta/packages/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
4 4
5inherit cross-canadian 5inherit cross-canadian
6 6
7PR = "r0" 7PR = "r1"
8 8
9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
10EXPAT = "--with-expat" 10EXPAT = "--with-expat"
diff --git a/meta/packages/gdb/gdb-cross_7.1.bb b/meta/packages/gdb/gdb-cross_7.1.bb
index b0d0ab87c2..3e4ce6f68b 100644
--- a/meta/packages/gdb/gdb-cross_7.1.bb
+++ b/meta/packages/gdb/gdb-cross_7.1.bb
@@ -2,4 +2,4 @@ require gdb-cross.inc
2 2
3SRC_URI += "file://sim-install-6.6.patch;patch=1" 3SRC_URI += "file://sim-install-6.6.patch;patch=1"
4 4
5PR = "r0" 5PR = "r1"
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/packages/gdb/gdb_7.1.bb
index 5b8f3769bd..be40f3f12b 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 = "r1" 3PR = "r2"