Bug#277852: gcc-3.4: Please replace 'lib64' with 'lib' in gcc/config/i386/linux64.h on amd64

[Andreas Jochens <aj@andaco.de>]

Package: gcc-3.4
Severity: wishlist
Tags: patch

The attached patch changes the directory that gcc-3.4 uses to locate the 
dynamic linker on amd64 from 'lib64' to 'lib'. This is one of the last 
few places where the ugly 'lib64' directory is still used on amd64. 
The dynamic linker is installed in the 'lib' directory by the 'libc6' 
package and this location should also be used by gcc-3.4.

The current usage of 'lib64' in the dynamic linker name makes it very easy
to make the whole system completely unusable by just removing the 'lib64'
directory symlink. There have already been a few complaints from people who
ran into this problem (e.g. someone removed the 'lib64' symlink 
because he wanted to create a separate real 'lib64' directory 
to install some non-free binary-only software which required this).

Regards
Andreas Jochens

diff -urN ../tmp-orig/gcc-3.4-3.4.2/debian/patches/amd64-biarch.dpatch ./debian/patches/amd64-biarch.dpatch
--- ../tmp-orig/gcc-3.4-3.4.2/debian/patches/amd64-biarch.dpatch	2004-10-22 19:18:25.120661168 +0000
+++ ./debian/patches/amd64-biarch.dpatch	2004-10-22 19:17:36.502052320 +0000
@@ -86,3 +86,14 @@
  esac
  
  # Remove extraneous blanks from multidirs.
+--- linux64.h	2003-11-29 03:08:10.000000000 +0000
++++ gcc/config/i386/linux64.h	2004-10-07 17:57:27.295477928 +0000
+@@ -61,7 +61,7 @@
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+       %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+-      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
++      %{!m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux-x86-64.so.2}}} \
+     %{static:-static}}"
+ 
+ #define MULTILIB_DEFAULTS { "m64" }