aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-03-16 10:20:52 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 11:55:24 +0000
commit19a825a578e2e705e5502982b787cff54d021359 (patch)
tree78b291d9c2995802ba77848d770b0da71a4a1959
parent456c4a8ffc9a292d7a3e036d92baf4a8f14d1f45 (diff)
downloadopenembedded-core-contrib-19a825a578e2e705e5502982b787cff54d021359.zip
openembedded-core-contrib-19a825a578e2e705e5502982b787cff54d021359.tar.gz
openembedded-core-contrib-19a825a578e2e705e5502982b787cff54d021359.tar.bz2
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. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc3
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 5b8087c..239b375 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -47,11 +47,12 @@ do_configure () {
}
# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
-# right bits installed by binutils.
+# right bits installed by binutils. Same for bfd.info -- also from binutils.
do_install_append() {
rm -rf ${D}${libdir}
rm -rf ${D}${includedir}
rm -rf ${D}${datadir}/locale
+ rm -f ${D}${infodir}/bfd.info
}
RRECOMMENDS_gdb_append_linux = " glibc-thread-db "