e6695723f7
With `-static', only link statically against uninstalled libtool libraries. Fixes 1.5.x regression to match documented (and actual 1.4.x) behavior. From libtool CVS
134 lines
4.6 KiB
Plaintext
134 lines
4.6 KiB
Plaintext
$OpenBSD: patch-ltmain_in,v 1.13 2005/11/02 02:47:09 brad Exp $
|
|
--- ltmain.in.orig Wed Aug 31 14:25:28 2005
|
|
+++ ltmain.in Tue Nov 1 15:13:43 2005
|
|
@@ -1089,14 +1089,15 @@ EOF
|
|
if test -n "$link_static_flag"; then
|
|
dlopen_self=$dlopen_self_static
|
|
fi
|
|
+ prefer_static_libs=yes
|
|
else
|
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
|
dlopen_self=$dlopen_self_static
|
|
fi
|
|
+ prefer_static_libs=built
|
|
fi
|
|
build_libtool_libs=no
|
|
build_old_libs=yes
|
|
- prefer_static_libs=yes
|
|
break
|
|
;;
|
|
esac
|
|
@@ -1984,6 +1985,17 @@ EOF
|
|
;;
|
|
esac
|
|
for pass in $passes; do
|
|
+ # The preopen pass in lib mode reverses $deplibs; put it back here
|
|
+ # so that -L comes before libs that need it for instance...
|
|
+ if test "$linkmode,$pass" = "lib,link"; then
|
|
+ ## FIXME: Find the place where the list is rebuilt in the wrong
|
|
+ ## order, and fix it there properly
|
|
+ tmp_deplibs=
|
|
+ for deplib in $deplibs; do
|
|
+ tmp_deplibs="$deplib $tmp_deplibs"
|
|
+ done
|
|
+ deplibs="$tmp_deplibs"
|
|
+ fi
|
|
if test "$linkmode,$pass" = "lib,link" ||
|
|
test "$linkmode,$pass" = "prog,scan"; then
|
|
libs="$deplibs"
|
|
@@ -2245,20 +2257,20 @@ EOF
|
|
# It is a libtool convenience library, so add in its objects.
|
|
convenience="$convenience $ladir/$objdir/$old_library"
|
|
old_convenience="$old_convenience $ladir/$objdir/$old_library"
|
|
- tmp_libs=
|
|
- for deplib in $dependency_libs; do
|
|
- deplibs="$deplib $deplibs"
|
|
- if test "X$duplicate_deps" = "Xyes" ; then
|
|
- case "$tmp_libs " in
|
|
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
- esac
|
|
- fi
|
|
- tmp_libs="$tmp_libs $deplib"
|
|
- done
|
|
elif test "$linkmode" != prog && test "$linkmode" != lib; then
|
|
$echo "$modename: \`$lib' is not a convenience library" 1>&2
|
|
exit $EXIT_FAILURE
|
|
fi
|
|
+ tmp_libs=
|
|
+ for deplib in $dependency_libs; do
|
|
+ deplibs="$deplib $deplibs"
|
|
+ if test "X$duplicate_deps" = "Xyes" ; then
|
|
+ case "$tmp_libs " in
|
|
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
+ esac
|
|
+ fi
|
|
+ tmp_libs="$tmp_libs $deplib"
|
|
+ done
|
|
continue
|
|
fi # $pass = conv
|
|
|
|
@@ -2445,8 +2457,12 @@ EOF
|
|
fi
|
|
|
|
link_static=no # Whether the deplib will be linked statically
|
|
+ use_static_libs=$prefer_static_libs
|
|
+ if test "$use_static_libs" = built && test "$installed" = yes ; then
|
|
+ use_static_libs=no
|
|
+ fi
|
|
if test -n "$library_names" &&
|
|
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
|
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
|
|
if test "$installed" = no; then
|
|
notinst_deplibs="$notinst_deplibs $lib"
|
|
need_relink=yes
|
|
@@ -2644,7 +2660,7 @@ EOF
|
|
add_dir=
|
|
add=
|
|
# Finalize command for both is simple: just hardcode it.
|
|
- if test "$hardcode_direct" = yes; then
|
|
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
|
|
add="$libdir/$linklib"
|
|
elif test "$hardcode_minus_L" = yes; then
|
|
add_dir="-L$libdir"
|
|
@@ -5932,40 +5948,6 @@ relink_command=\"$relink_command\""
|
|
# Exit here if they wanted silent mode.
|
|
test "$show" = : && exit $EXIT_SUCCESS
|
|
|
|
- $echo "----------------------------------------------------------------------"
|
|
- $echo "Libraries have been installed in:"
|
|
- for libdir in $libdirs; do
|
|
- $echo " $libdir"
|
|
- done
|
|
- $echo
|
|
- $echo "If you ever happen to want to link against installed libraries"
|
|
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
- $echo "flag during linking and do at least one of the following:"
|
|
- if test -n "$shlibpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
- $echo " during execution"
|
|
- fi
|
|
- if test -n "$runpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
- $echo " during linking"
|
|
- fi
|
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
|
- libdir=LIBDIR
|
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
-
|
|
- $echo " - use the \`$flag' linker flag"
|
|
- fi
|
|
- if test -n "$admincmds"; then
|
|
- $echo " - have your system administrator run these commands:$admincmds"
|
|
- fi
|
|
- if test -f /etc/ld.so.conf; then
|
|
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
- fi
|
|
- $echo
|
|
- $echo "See any operating system documentation about shared libraries for"
|
|
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
- $echo "----------------------------------------------------------------------"
|
|
exit $EXIT_SUCCESS
|
|
;;
|
|
|