[oe-commits] [openembedded-core] 05/22: gdb: don't bundle bfd.info -- leave that to binutils.

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 03e4de3421e9f791dcc9db3b51bc6702c080c072
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
AuthorDate: Thu Mar 16 10:20:52 2017 -0400

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/gdb/gdb-common.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 "

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.