71 lines
2.6 KiB
Plaintext
71 lines
2.6 KiB
Plaintext
|
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
|
||
|
|
--- ltmain.sh.orig 2004-02-12 03:45:26.000000000 -0800
|
||
|
|
+++ ltmain.sh 2004-05-02 10:11:56.000000000 -0700
|
||
|
|
@@ -1847,9 +1847,12 @@ EOF
|
||
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
||
|
|
compile_deplibs="$deplib $compile_deplibs"
|
||
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
||
|
|
- else
|
||
|
|
- deplibs="$deplib $deplibs"
|
||
|
|
+ continue
|
||
|
|
fi
|
||
|
|
+ if test "$linkmode" = "lib"; then
|
||
|
|
+ newdependency_libs="$deplib $newdependency_libs"
|
||
|
|
+ fi
|
||
|
|
+ deplibs="$deplib $deplibs"
|
||
|
|
continue
|
||
|
|
;;
|
||
|
|
-l*)
|
||
|
|
@@ -2262,10 +2265,6 @@ EOF
|
||
|
|
link_static=no # Whether the deplib will be linked statically
|
||
|
|
if test -n "$library_names" &&
|
||
|
|
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||
|
|
- if test "$installed" = no; then
|
||
|
|
- notinst_deplibs="$notinst_deplibs $lib"
|
||
|
|
- need_relink=yes
|
||
|
|
- fi
|
||
|
|
# This is a shared library
|
||
|
|
|
||
|
|
# Warn about portability, can't link against -module's on some systems (darwin)
|
||
|
|
@@ -5804,40 +5803,6 @@ relink_command=\"$relink_command\""
|
||
|
|
# Exit here if they wanted silent mode.
|
||
|
|
test "$show" = : && exit 0
|
||
|
|
|
||
|
|
- $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 0
|
||
|
|
;;
|
||
|
|
|