Contents of /trunk/gimp/patches/ltmain_sh-1.5.0-fix-relink.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1718 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1718 byte(s)
-import
1 | --- ltmain.sh.norelinkfix 2003-09-24 18:18:14.961005184 +0200 |
2 | +++ ltmain.sh 2003-09-24 18:20:11.204333512 +0200 |
3 | @@ -2022,6 +2022,8 @@ |
4 | convenience="$convenience $ladir/$objdir/$old_library" |
5 | old_convenience="$old_convenience $ladir/$objdir/$old_library" |
6 | tmp_libs= |
7 | + # PKGW |
8 | + dependency_libs= |
9 | for deplib in $dependency_libs; do |
10 | deplibs="$deplib $deplibs" |
11 | if test "X$duplicate_deps" = "Xyes" ; then |
12 | @@ -2143,6 +2145,8 @@ |
13 | fi |
14 | |
15 | tmp_libs= |
16 | + #PKGW |
17 | + dependency_libs= |
18 | for deplib in $dependency_libs; do |
19 | case $deplib in |
20 | -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
21 | @@ -2359,7 +2363,9 @@ |
22 | if test -n "$inst_prefix_dir"; then |
23 | case "$libdir" in |
24 | [\\/]*) |
25 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
26 | + # Add the install location to the beginning, minimising possiblilty |
27 | + # of linking to older version of the lib already installed. |
28 | + add_dir="-L$inst_prefix_dir$libdir $add_dir" |
29 | ;; |
30 | esac |
31 | fi |
32 | @@ -2431,7 +2437,9 @@ |
33 | if test -n "$inst_prefix_dir"; then |
34 | case "$libdir" in |
35 | [\\/]*) |
36 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
37 | + # Add the install location to the beginning, minimising possiblilty |
38 | + # of linking to older version of the lib already installed. |
39 | + add_dir="-L$inst_prefix_dir$libdir $add_dir" |
40 | ;; |
41 | esac |
42 | fi |
43 | @@ -2691,7 +2699,7 @@ |
44 | -L*) |
45 | case " $tmp_libs " in |
46 | *" $deplib "*) ;; |
47 | - *) tmp_libs="$tmp_libs $deplib" ;; |
48 | + *) tmp_libs="$deplib $tmp_libs" ;; |
49 | esac |
50 | ;; |
51 | *) tmp_libs="$tmp_libs $deplib" ;; |