- remove two unneeded patches
spotted by brad
This commit is contained in:
parent
32b4023745
commit
76b263011c
@ -1,70 +0,0 @@
|
||||
--- ltmain.sh.orig Mon Jun 19 21:36:49 2006
|
||||
+++ ltmain.sh Sun Sep 16 20:04:20 2007
|
||||
@@ -2101,10 +2101,12 @@ EOF
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
- else
|
||||
- compiler_flags="$compiler_flags $deplib"
|
||||
+ continue
|
||||
fi
|
||||
- continue
|
||||
+ if test "$linkmode" = "lib"; then
|
||||
+ newdependency_libs="$deplib $newdependency_libs"
|
||||
+ fi
|
||||
+ compiler_flags="$deplib $compiler_flags"
|
||||
;;
|
||||
-l*)
|
||||
if test "$linkmode" != lib && test "$linkmode" != prog; then
|
||||
@@ -2543,10 +2545,6 @@ EOF
|
||||
fi
|
||||
if test -n "$library_names" &&
|
||||
{ test "$use_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
|
||||
@@ -6265,40 +6263,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
- $echo "X----------------------------------------------------------------------" | $Xsed
|
||||
- $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 "X----------------------------------------------------------------------" | $Xsed
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
@ -1,77 +0,0 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.7 2007/04/27 22:54:23 jasper Exp $
|
||||
--- ltmain.sh.orig Sat Mar 24 10:50:11 2007
|
||||
+++ ltmain.sh Sat Mar 24 10:54:02 2007
|
||||
@@ -2306,6 +2306,21 @@ EOF
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
+
|
||||
+ -pthread)
|
||||
+ case $linkmode in
|
||||
+ lib)
|
||||
+ deplibs="$deplib $deplibs"
|
||||
+ newdependency_libs="$deplib $newdependency_libs"
|
||||
+ ;;
|
||||
+ prog)
|
||||
+ compile_deplibs="$deplib $compile_deplibs"
|
||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ continue
|
||||
+ ;;
|
||||
+
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -2572,10 +2587,6 @@ EOF
|
||||
fi
|
||||
if test -n "$library_names" &&
|
||||
{ test "$use_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
|
||||
@@ -6300,40 +6311,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
- $echo "X----------------------------------------------------------------------" | $Xsed
|
||||
- $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 "X----------------------------------------------------------------------" | $Xsed
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
Loading…
x
Reference in New Issue
Block a user