|
Lines 2022-2027
Link Here
|
| 2022 |
convenience="$convenience $ladir/$objdir/$old_library" |
2022 |
convenience="$convenience $ladir/$objdir/$old_library" |
| 2023 |
old_convenience="$old_convenience $ladir/$objdir/$old_library" |
2023 |
old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 2024 |
tmp_libs= |
2024 |
tmp_libs= |
|
|
2025 |
# PKGW |
| 2026 |
dependency_libs= |
| 2025 |
for deplib in $dependency_libs; do |
2027 |
for deplib in $dependency_libs; do |
| 2026 |
deplibs="$deplib $deplibs" |
2028 |
deplibs="$deplib $deplibs" |
| 2027 |
if test "X$duplicate_deps" = "Xyes" ; then |
2029 |
if test "X$duplicate_deps" = "Xyes" ; then |
|
Lines 2143-2148
Link Here
|
| 2143 |
fi |
2145 |
fi |
| 2144 |
|
2146 |
|
| 2145 |
tmp_libs= |
2147 |
tmp_libs= |
|
|
2148 |
#PKGW |
| 2149 |
dependency_libs= |
| 2146 |
for deplib in $dependency_libs; do |
2150 |
for deplib in $dependency_libs; do |
| 2147 |
case $deplib in |
2151 |
case $deplib in |
| 2148 |
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
2152 |
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
|
Lines 2359-2365
Link Here
|
| 2359 |
if test -n "$inst_prefix_dir"; then |
2363 |
if test -n "$inst_prefix_dir"; then |
| 2360 |
case "$libdir" in |
2364 |
case "$libdir" in |
| 2361 |
[\\/]*) |
2365 |
[\\/]*) |
| 2362 |
add_dir="$add_dir -L$inst_prefix_dir$libdir" |
2366 |
# Add the install location to the beginning, minimising possiblilty |
|
|
2367 |
# of linking to older version of the lib already installed. |
| 2368 |
add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2363 |
;; |
2369 |
;; |
| 2364 |
esac |
2370 |
esac |
| 2365 |
fi |
2371 |
fi |
|
Lines 2431-2437
Link Here
|
| 2431 |
if test -n "$inst_prefix_dir"; then |
2437 |
if test -n "$inst_prefix_dir"; then |
| 2432 |
case "$libdir" in |
2438 |
case "$libdir" in |
| 2433 |
[\\/]*) |
2439 |
[\\/]*) |
| 2434 |
add_dir="$add_dir -L$inst_prefix_dir$libdir" |
2440 |
# Add the install location to the beginning, minimising possiblilty |
|
|
2441 |
# of linking to older version of the lib already installed. |
| 2442 |
add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2435 |
;; |
2443 |
;; |
| 2436 |
esac |
2444 |
esac |
| 2437 |
fi |
2445 |
fi |
|
Lines 2691-2697
Link Here
|
| 2691 |
-L*) |
2699 |
-L*) |
| 2692 |
case " $tmp_libs " in |
2700 |
case " $tmp_libs " in |
| 2693 |
*" $deplib "*) ;; |
2701 |
*" $deplib "*) ;; |
| 2694 |
*) tmp_libs="$tmp_libs $deplib" ;; |
2702 |
*) tmp_libs="$deplib $tmp_libs" ;; |
| 2695 |
esac |
2703 |
esac |
| 2696 |
;; |
2704 |
;; |
| 2697 |
*) tmp_libs="$tmp_libs $deplib" ;; |
2705 |
*) tmp_libs="$tmp_libs $deplib" ;; |
