sync libtool patches
This commit is contained in:
danh
parent
505896493a
commit
5ee629216a
@ -1,7 +1,17 @@
|
||||
$OpenBSD: patch-libnasl_ltconfig,v 1.2 2000/12/28 16:07:06 matt Exp $
|
||||
$OpenBSD: patch-libnasl_ltconfig,v 1.3 2001/02/20 20:52:21 danh Exp $
|
||||
--- libnasl/ltconfig.orig Mon Apr 3 11:13:02 2000
|
||||
+++ libnasl/ltconfig Sat Nov 25 19:35:15 2000
|
||||
@@ -1396,10 +1396,18 @@ else
|
||||
+++ libnasl/ltconfig Tue Feb 20 15:48:49 2001
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1396,10 +1399,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
@ -10,19 +20,22 @@ $OpenBSD: patch-libnasl_ltconfig,v 1.2 2000/12/28 16:07:06 matt Exp $
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[01234567])
|
||||
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1997,13 +2005,10 @@ netbsd*)
|
||||
@@ -1997,13 +2011,10 @@ netbsd*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
|
||||
@ -1,7 +1,37 @@
|
||||
$OpenBSD: patch-libnasl_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
$OpenBSD: patch-libnasl_ltmain_sh,v 1.2 2001/02/20 20:52:22 danh Exp $
|
||||
--- libnasl/ltmain.sh.orig Fri Jul 7 20:16:21 2000
|
||||
+++ libnasl/ltmain.sh Sat Dec 16 14:48:52 2000
|
||||
@@ -1795,6 +1795,9 @@ compiler."
|
||||
+++ libnasl/ltmain.sh Tue Feb 20 15:49:49 2001
|
||||
@@ -1079,7 +1079,18 @@ 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
|
||||
*-*-cygwin* | *-*-beos*)
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1795,6 +1810,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
@ -11,7 +41,7 @@ $OpenBSD: patch-libnasl_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3537,40 +3540,6 @@ libdir='$install_libdir'\
|
||||
@@ -3537,40 +3555,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
|
||||
@ -1,7 +1,17 @@
|
||||
$OpenBSD: patch-nessus-plugins_ltconfig,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
$OpenBSD: patch-nessus-plugins_ltconfig,v 1.2 2001/02/20 20:52:22 danh Exp $
|
||||
--- nessus-plugins/ltconfig.orig Mon Apr 3 11:13:19 2000
|
||||
+++ nessus-plugins/ltconfig Sat Nov 25 19:35:28 2000
|
||||
@@ -1396,10 +1396,18 @@ else
|
||||
+++ nessus-plugins/ltconfig Tue Feb 20 15:51:51 2001
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1396,10 +1399,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
@ -10,19 +20,22 @@ $OpenBSD: patch-nessus-plugins_ltconfig,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[01234567])
|
||||
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1997,13 +2005,10 @@ netbsd*)
|
||||
@@ -1997,13 +2011,10 @@ netbsd*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
|
||||
@ -1,7 +1,37 @@
|
||||
$OpenBSD: patch-nessus-plugins_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
$OpenBSD: patch-nessus-plugins_ltmain_sh,v 1.2 2001/02/20 20:52:22 danh Exp $
|
||||
--- nessus-plugins/ltmain.sh.orig Fri Jul 7 20:16:48 2000
|
||||
+++ nessus-plugins/ltmain.sh Sat Dec 16 14:48:53 2000
|
||||
@@ -1795,6 +1795,9 @@ compiler."
|
||||
+++ nessus-plugins/ltmain.sh Tue Feb 20 15:50:53 2001
|
||||
@@ -1079,7 +1079,18 @@ 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
|
||||
*-*-cygwin* | *-*-beos*)
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1795,6 +1810,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
@ -11,7 +41,7 @@ $OpenBSD: patch-nessus-plugins_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3537,40 +3540,6 @@ libdir='$install_libdir'\
|
||||
@@ -3537,40 +3555,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user