tags 582490 + patch
quit

Piotr Engelking wrote:

> Binutils-multiarch breaks ld by diverting ld.bfd away without providing
> a replacement:

I think ld.bfd disappeared at the same time as the recent upstream
--enable-gold changes.

How about this patch?  Tested by building a few packages with
binutils-multiarch installed.

 debian/changelog |    6 +++++-
 debian/rules     |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad2e482..1b06074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ binutils (2.20.51.20100518-1.1) experimental; urgency=low
   * debian/binutils-multiarch.preinst.in: Re-add diversions on reinstall.
     Closes: #581156.
   * Remove c++filt from binutils-multiarch.
+  * Rename /usr/bin/ld from multiarch build to ld.bfd. Closes: #582490.
 
- -- Jonathan Nieder <jrnie...@gmail.com>  Thu, 20 May 2010 02:38:32 -0500
+ -- Jonathan Nieder <jrnie...@gmail.com>  Thu, 20 May 2010 05:45:06 -0500
 
 binutils (2.20.51.20100518-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 46db4f4..6f9e06e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -519,8 +519,8 @@ ifeq ($(with_multiarch),yes)
                rm -f $(d_mul)/usr/lib/ldscripts/`basename $$i`; \
        done
 
-       : # binutils provides the ld symlink.
-       rm -f $(d_mul)/usr/bin/ld
+       : # binutils will provide the ld symlink.
+       mv -f $(d_mul)/usr/bin/ld $(d_mul)/usr/bin/ld.bfd
 
   ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64))
        rm -f $(d_mul)/usr/bin/embedspu
-- 
1.7.1




-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to