diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-03-16 10:20:52 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:04 +0000 |
| commit | 5686689408fbdb863ea63ae0dd30029a54901b39 (patch) | |
| tree | 41fa03b0b7a2044b7201cbd6bc04a5af99e08672 /meta/recipes-devtools/gdb | |
| parent | aa66e8782ed9b869480e4a1aac12923dfee10368 (diff) | |
| download | poky-5686689408fbdb863ea63ae0dd30029a54901b39.tar.gz | |
gdb: don't bundle bfd.info -- leave that to binutils.
We see:
file /usr/share/info/bfd.info conflicts between attempted installs
of gdb-doc-7.12.1-r0.core2_64 and binutils-doc-2.28-r0.core2_64
You can't really have gdb and not binutils, so there is no need
to do alternatives here ; just clobber the one from gdb and let
the binutils one be the default.
(From OE-Core rev: 19a825a578e2e705e5502982b787cff54d021359)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gdb')
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-common.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 5b8087c3ba..239b37586b 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc | |||
| @@ -47,11 +47,12 @@ do_configure () { | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the | 49 | # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the |
| 50 | # right bits installed by binutils. | 50 | # right bits installed by binutils. Same for bfd.info -- also from binutils. |
| 51 | do_install_append() { | 51 | do_install_append() { |
| 52 | rm -rf ${D}${libdir} | 52 | rm -rf ${D}${libdir} |
| 53 | rm -rf ${D}${includedir} | 53 | rm -rf ${D}${includedir} |
| 54 | rm -rf ${D}${datadir}/locale | 54 | rm -rf ${D}${datadir}/locale |
| 55 | rm -f ${D}${infodir}/bfd.info | ||
| 55 | } | 56 | } |
| 56 | 57 | ||
| 57 | RRECOMMENDS_gdb_append_linux = " glibc-thread-db " | 58 | RRECOMMENDS_gdb_append_linux = " glibc-thread-db " |
