[PATCH binutils-multiarch] rm /usr/bin/c++filt
The behavior of single-arch and multiarch c++filt do not differ except
in --version output. Remove the unnecessary multiarch version.
Thanks to Matthias Klose for noticing.
---
Warning: not even build-tested.
debian/binutils-multiarch.postinst | 1 +
debian/binutils-multiarch.postrm.in | 5 +----
debian/binutils-multiarch.preinst.in | 5 +----
debian/binutils-multiarch.prerm.in | 1 +
debian/changelog | 6 ++++++
debian/rules | 7 +++++++
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/debian/binutils-multiarch.postinst b/debian/binutils-multiarch.postinst
index 204ccd2..19965ff 100644
--- a/debian/binutils-multiarch.postinst
+++ b/debian/binutils-multiarch.postinst
@@ -21,6 +21,7 @@ old_diversion() {
}
# remove obsolete diversions
+old_diversion /usr/bin/c++filt
old_diversion /usr/lib/libbfd.a /usr/lib/libbfd-single.a
old_diversion /usr/lib/libopcodes.a /usr/lib/libopcodes-single.a
old_diversion /usr/bin/ld
diff --git a/debian/binutils-multiarch.postrm.in b/debian/binutils-multiarch.postrm.in
index 8817d14..777a3c9 100644
--- a/debian/binutils-multiarch.postrm.in
+++ b/debian/binutils-multiarch.postrm.in
@@ -43,10 +43,7 @@ for prog in nm objdump objcopy strings strip size \
do
diversion 2.9.5.0.16-1 "/usr/bin/$prog"
done
-for prog in ld.bfd c++filt
-do
- diversion 2.20.51.20100418-1 "/usr/bin/$prog"
-done
+diversion 2.20.51.20100418-1 /usr/bin/ld.bfd
if [ "$1" = "remove" ]; then
ldconfig
diff --git a/debian/binutils-multiarch.preinst.in b/debian/binutils-multiarch.preinst.in
index 1fcaaba..140224e 100644
--- a/debian/binutils-multiarch.preinst.in
+++ b/debian/binutils-multiarch.preinst.in
@@ -20,10 +20,7 @@ diversion() {
fi
}
-for prog in ld.bfd c++filt
-do
- diversion 2.20.51.20100418-1 "/usr/bin/$prog"
-done
+diversion 2.20.51.20100418-1 /usr/bin/ld.bfd
for prog in nm objdump objcopy strings strip size \
ar ranlib addr2line gprof readelf
do
diff --git a/debian/binutils-multiarch.prerm.in b/debian/binutils-multiarch.prerm.in
index 903c226..00ed78f 100644
--- a/debian/binutils-multiarch.prerm.in
+++ b/debian/binutils-multiarch.prerm.in
@@ -39,6 +39,7 @@ old_diversion() {
}
# remove obsolete diversions
+old_diversion /usr/bin/c++filt
old_diversion /usr/lib/libbfd.a /usr/lib/libbfd-single.a
old_diversion /usr/lib/libopcodes.a /usr/lib/libopcodes-single.a
old_diversion /usr/bin/ld
diff --git a/debian/changelog b/debian/changelog
index 5e19089..1b24ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+binutils (2.20.51.20100518-1.1) experimental; urgency=low
+
+ * Remove c++filt from binutils-multiarch.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Thu, 20 May 2010 02:30:03 -0500
+
binutils (2.20.51.20100518-1) experimental; urgency=low
* Snapshot, taken from the trunk 20100518.
diff --git a/debian/rules b/debian/rules
index 6ba105f..46db4f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -503,6 +503,11 @@ ifeq ($(with_multiarch),yes)
: # is the same for all targets.
rm -f $(d_mul)/usr/bin/elfedit
+ : # c++filt does not link to libbfd for anything more than
+ : # the help message, and its behavior does not vary
+ : # between arches aside from the --version message.
+ rm -f $(d_mul)/usr/bin/c++filt
+
: # As gas/README points out (search for --enable-targets),
: # multi-arch gas is not ready yet.
rm -f $(d_mul)/usr/bin/as
--
1.7.1
Reply to: