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