sync libtool patches

This commit is contained in:
brad 2001-02-18 20:10:11 +00:00
parent c9103b2e41
commit e9805e72cd
2 changed files with 42 additions and 10 deletions

View File

@ -1,5 +1,5 @@
--- ltconfig.orig Mon Oct 9 19:37:56 2000
+++ ltconfig Sat Nov 18 12:37:45 2000
--- ltconfig.orig Fri Dec 8 16:05:55 2000
+++ ltconfig Sun Feb 18 10:09:38 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
@ -10,7 +10,7 @@
esac
@@ -1396,10 +1399,18 @@
@@ -1396,10 +1399,21 @@
;;
openbsd*)
@ -19,19 +19,22 @@
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 +2008,10 @@
@@ -1997,13 +2011,10 @@
openbsd*)
version_type=sunos

View File

@ -1,16 +1,45 @@
--- ltmain.sh.orig Mon Oct 9 19:37:56 2000
+++ ltmain.sh Sat Nov 18 12:37:45 2000
@@ -1795,6 +1795,9 @@
--- ltmain.sh.orig Fri Dec 8 16:05:55 2000
+++ ltmain.sh Sun Feb 18 09:58:38 2001
@@ -1079,6 +1079,17 @@
# 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 @@
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3558,6 @@
@@ -3555,40 +3573,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0