aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-10-04 16:29:17 -0700
committerTom Rini <tom_rini@mentor.com>2010-10-04 16:56:07 -0700
commit1e2e6295dae84b73ba33c24ddeeb8916667afe68 (patch)
tree09728d9883c99ab7b26f9af3aaabc3d6ab8db3ea
parent2c7b3abb44413bdc039f0ac52a8d9b9ef147a724 (diff)
downloadopenembedded-1e2e6295dae84b73ba33c24ddeeb8916667afe68.tar.gz
openembedded-1e2e6295dae84b73ba33c24ddeeb8916667afe68.tar.bz2
openembedded-1e2e6295dae84b73ba33c24ddeeb8916667afe68.zip
gdb-common.inc: Nuke a few more possible conflicts.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--recipes/gdb/gdb-common.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/recipes/gdb/gdb-common.inc b/recipes/gdb/gdb-common.inc
index 344c10b4db..48a12d16e5 100644
--- a/recipes/gdb/gdb-common.inc
+++ b/recipes/gdb/gdb-common.inc
@@ -23,13 +23,16 @@ S = "${WORKDIR}/gdb-${PV}"
B = "${WORKDIR}/build-${TARGET_SYS}"
do_install_append() {
- # these mo files from gdb-cross-sdk clash with files from binutils-cross-sdk
- # when building sdk archives. Drop them for now as a way to restore toolchains.
- rm -f ${D}/${datadir}/locale/*/LC_MESSAGES/{bfd,opcodes}.mo
+ # these mo and doc files from gdb-cross-sdk clash with files from
+ # binutils-cross-sdk when building sdk archives. Drop them for now as a
+ # way to restore toolchains.
+ rm -f ${D}${datadir}/locale/*/LC_MESSAGES/{bfd,opcodes}.mo
+ rm -rf ${D}${docdir}/bfd.html
# we don't care about these infos, installed from binutils
- rm -f ${D}/${infodir}/{configure,standards,bfd}.info
- rm -f ${D}/${infodir}/dir
+ rm -f ${D}${infodir}/{configure,standards,bfd}.info
+ rm -f ${D}${docdir}/{configure,standards,bfd,libiberty}.html
+ rm -f ${D}${infodir}/dir
# We use libiberty from binutils
rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
@@ -41,4 +44,3 @@ do_install_append() {
# Use libopcodes from binutils.
rm -f ${D}${prefix}/lib/libopcodes.{,l}a
}
-