| [617118d] | 1 | Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au) | 
|---|
|  | 2 | Origin: Ryan Oliver | 
|---|
|  | 3 | Date: 2005-03-21 | 
|---|
|  | 4 | Initial Package Version: 3.4.3 | 
|---|
|  | 5 | Description: This patch is primarily here to fix issues with libtool when building | 
|---|
|  | 6 | packages on a multi-arch/multilib system, as libtool effectively uses the | 
|---|
|  | 7 | library search paths from gcc -print-search-dirs to locate .la files. | 
|---|
|  | 8 | This poses a problem as by default gcc supplies | 
|---|
|  | 9 | eg: /usr/lib64/gcc/x86_64-pc-linux-gnu/3.4.3/../../../ | 
|---|
|  | 10 | which following the example would cause libtool to use .la files under | 
|---|
|  | 11 | /usr/lib64 instead of /usr/lib if building a package 32bit, and thus will | 
|---|
|  | 12 | attempt to link in incompatible 64bit libraries. | 
|---|
|  | 13 | Here we simply remove this path ( provided by standard_startfile_prefix ) | 
|---|
|  | 14 | from the library search order | 
|---|
|  | 15 |  | 
|---|
|  | 16 | diff -uNr gcc-3.4.3-orig/gcc/gcc.c gcc-3.4.3/gcc/gcc.c | 
|---|
|  | 17 | --- gcc-3.4.3-orig/gcc/gcc.c    2004-09-09 01:16:11.000000000 +1000 | 
|---|
|  | 18 | +++ gcc-3.4.3/gcc/gcc.c 2005-03-21 17:54:44.000000000 +1100 | 
|---|
|  | 19 | @@ -6135,7 +6135,7 @@ | 
|---|
|  | 20 | add_sysrooted_prefix (&startfile_prefixes, | 
|---|
|  | 21 | standard_startfile_prefix, "BINUTILS", | 
|---|
|  | 22 | PREFIX_PRIORITY_LAST, 0, NULL, 1); | 
|---|
|  | 23 | -      else if (*cross_compile == '0') | 
|---|
|  | 24 | +      /* else if (*cross_compile == '0') | 
|---|
|  | 25 | { | 
|---|
|  | 26 | if (gcc_exec_prefix) | 
|---|
|  | 27 | add_prefix (&startfile_prefixes, | 
|---|
|  | 28 | @@ -6147,7 +6147,7 @@ | 
|---|
|  | 29 | machine_suffix, | 
|---|
|  | 30 | standard_startfile_prefix, NULL), | 
|---|
|  | 31 | NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); | 
|---|
|  | 32 | -       } | 
|---|
|  | 33 | +       } */ | 
|---|
|  | 34 |  | 
|---|
|  | 35 | add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1, | 
|---|
|  | 36 | "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); | 
|---|