source: scripts/patches/gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch@ 643f8be

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 643f8be was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move

  • Property mode set to 100644
File size: 1.5 KB
RevLine 
[617118d]1Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
2Origin: Ryan Oliver
3Date: 2005-03-21
4Initial Package Version: 3.4.3
5Description: 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
16diff -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);
Note: See TracBrowser for help on using the repository browser.