- remove unneeded patches, these ports use devel/libtool for a while
from brad@, also prodding by ajacoutot@
This commit is contained in:
parent
bbb4070e93
commit
5f786b2cb6
@ -1,48 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.2 2004/09/26 09:23:44 sturm Exp $
|
|
||||||
--- ltmain.sh.orig Sat Jan 4 20:04:07 2003
|
|
||||||
+++ ltmain.sh Sun Sep 26 10:06:26 2004
|
|
||||||
@@ -1031,12 +1031,34 @@ compiler."
|
|
||||||
# These systems don't actually have a C library (as such)
|
|
||||||
test "X$arg" = "X-lc" && continue
|
|
||||||
;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
+ elif test "$arg" = "-lc_r"; then
|
|
||||||
+ case "$host" in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc_r directly, use -pthread flag.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
fi
|
|
||||||
deplibs="$deplibs $arg"
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -3353,6 +3375,9 @@ static const void *lt_preloaded_setup()
|
|
||||||
# Transform the symbol file into the correct name.
|
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
|
||||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
|
||||||
+ ;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
|
|
@ -1,11 +0,0 @@
|
|||||||
$OpenBSD: patch-config_ltmain_sh,v 1.1.1.1 2005/08/07 22:13:37 robert Exp $
|
|
||||||
--- config/ltmain.sh.orig Sat Jan 22 16:02:26 2005
|
|
||||||
+++ config/ltmain.sh Sun Aug 7 23:29:12 2005
|
|
||||||
@@ -931,6 +931,7 @@
|
|
||||||
libobjs=
|
|
||||||
ltlibs=
|
|
||||||
module=no
|
|
||||||
+ need_version=no
|
|
||||||
no_install=no
|
|
||||||
objs=
|
|
||||||
non_pic_objects=
|
|
@ -1,72 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/01/10 23:32:23 couderc Exp $
|
|
||||||
--- ltmain.sh.orig Thu Aug 23 03:40:51 2001
|
|
||||||
+++ ltmain.sh Sun Jun 29 23:48:25 2003
|
|
||||||
@@ -1037,6 +1037,17 @@ compiler."
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -1473,6 +1484,9 @@ compiler."
|
|
||||||
fi
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ -pthread)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
%DEPLIBS%)
|
|
||||||
alldeplibs=yes
|
|
||||||
continue
|
|
||||||
@@ -4412,40 +4426,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.3 2004/02/24 23:23:27 brad Exp $
|
|
||||||
--- ltmain.sh.orig 2003-12-20 23:44:00.000000000 -0500
|
|
||||||
+++ ltmain.sh 2004-02-24 18:06:49.000000000 -0500
|
|
||||||
@@ -1062,6 +1062,17 @@ compiler."
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -4502,40 +4513,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:38:37 todd Exp $
|
|
||||||
--- ltmain.sh.orig Mon Jun 24 08:41:26 2002
|
|
||||||
+++ ltmain.sh Mon Aug 19 18:17:03 2002
|
|
||||||
@@ -1060,6 +1060,17 @@ compiler."
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -1496,6 +1507,9 @@ compiler."
|
|
||||||
fi
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ -pthread)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
%DEPLIBS%)
|
|
||||||
alldeplibs=yes
|
|
||||||
continue
|
|
||||||
@@ -4451,40 +4465,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.3 2005/10/07 13:24:53 wilfried Exp $
|
|
||||||
--- ltmain.sh.orig Wed Sep 28 15:43:18 2005
|
|
||||||
+++ ltmain.sh Thu Oct 6 11:17:31 2005
|
|
||||||
@@ -1085,6 +1085,17 @@ compiler."
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -4580,40 +4591,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.7 2007/11/06 21:18:10 rui Exp $
|
|
||||||
--- ltmain.sh.orig Sat Mar 11 18:49:04 2006
|
|
||||||
+++ ltmain.sh Fri Nov 2 15:06:59 2007
|
|
||||||
@@ -1607,6 +1607,17 @@ EOF
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -2279,6 +2290,10 @@ EOF
|
|
||||||
fi
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ -pthread)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
%DEPLIBS%)
|
|
||||||
alldeplibs=yes
|
|
||||||
continue
|
|
@ -1,44 +0,0 @@
|
|||||||
$OpenBSD: patch-texk_ltmain_sh,v 1.1 2005/02/21 21:36:07 sturm Exp $
|
|
||||||
--- texk/ltmain.sh.orig Sun Feb 13 18:40:23 2005
|
|
||||||
+++ texk/ltmain.sh Sun Feb 13 18:41:44 2005
|
|
||||||
@@ -4569,40 +4569,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
$OpenBSD: patch-admin_ltmain_sh,v 1.1.1.1 2003/04/17 09:18:56 wilfried Exp $
|
|
||||||
--- admin/ltmain.sh.orig Thu Jul 11 20:16:36 2002
|
|
||||||
+++ admin/ltmain.sh Tue Mar 25 15:58:15 2003
|
|
||||||
@@ -1229,6 +1229,17 @@ EOF
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -pthread)
|
|
||||||
+ case $host in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -1804,6 +1815,20 @@ 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
|
|
@ -1,56 +0,0 @@
|
|||||||
$OpenBSD: patch-libsnet_ltmain_sh,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
|
|
||||||
--- libsnet/ltmain.sh.orig Sat Jun 26 12:15:19 2004
|
|
||||||
+++ libsnet/ltmain.sh Sat Jun 26 12:15:53 2004
|
|
||||||
@@ -1756,11 +1756,6 @@ compiler."
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test "$installed" = no; then
|
|
||||||
- notinst_deplibs="$notinst_deplibs $lib"
|
|
||||||
- need_relink=yes
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
if test -n "$old_archive_from_expsyms_cmds"; then
|
|
||||||
# figure out the soname
|
|
||||||
set dummy $library_names
|
|
||||||
@@ -4528,40 +4523,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
|
|
||||||
;;
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
|||||||
$OpenBSD: patch-libwww_config_ltmain_sh,v 1.1 2001/10/02 20:18:59 heko Exp $
|
|
||||||
--- libwww/config/ltmain.sh.orig Mon Aug 28 17:23:04 2000
|
|
||||||
+++ libwww/config/ltmain.sh Tue Oct 2 00:39:51 2001
|
|
||||||
@@ -1079,6 +1079,17 @@ compiler."
|
|
||||||
# These systems don't actually have c library (as such)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ elif test "$arg" = "-lc_r"; then
|
|
||||||
+ case "$host" in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc_r directly, use -pthread flag.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
elif test "$arg" = "-lm"; then
|
|
||||||
case "$host" in
|
|
||||||
@@ -1091,6 +1102,10 @@ compiler."
|
|
||||||
deplibs="$deplibs $arg"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -?thread)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -2686,6 +2701,9 @@ static const void *lt_preloaded_setup()
|
|
||||||
# Absolute path.
|
|
||||||
rpath="$rpath$dir:"
|
|
||||||
;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
# Relative path: add a thisdir entry.
|
|
||||||
rpath="$rpath\$thisdir/$dir:"
|
|
||||||
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
|
|
||||||
# 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 \`-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
|
|
||||||
;;
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user