sync libtool patches

This commit is contained in:
danh 2001-02-19 22:02:04 +00:00
parent a35ec42213
commit 526383486e
2 changed files with 46 additions and 12 deletions

View File

@ -1,6 +1,6 @@
--- ltconfig.orig Mon Mar 20 07:45:00 2000
+++ ltconfig Sun Dec 24 21:12:33 2000
@@ -962,6 +962,9 @@
+++ ltconfig Mon Feb 19 15:51:46 2001
@@ -962,6 +962,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
@ -10,7 +10,7 @@
esac
@@ -1292,10 +1295,18 @@
@@ -1292,10 +1295,21 @@ else
;;
openbsd*)
@ -19,19 +19,22 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ 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 $linker_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$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*)
@@ -1684,13 +1695,10 @@
@@ -1684,13 +1698,10 @@ netbsd*)
openbsd*)
version_type=sunos

View File

@ -1,6 +1,37 @@
--- ltmain.sh.orig Mon Mar 20 07:45:01 2000
+++ ltmain.sh Sun Dec 24 21:04:44 2000
@@ -1031,6 +1031,9 @@
+++ ltmain.sh Mon Feb 19 15:53:04 2001
@@ -999,7 +999,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
- esac
+ *-*-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*)
@@ -1012,6 +1023,10 @@ compiler."
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1031,6 +1046,9 @@ compiler."
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
;;
@ -10,7 +41,7 @@
*)
no_install=yes
;;
@@ -4200,40 +4203,6 @@
@@ -4200,40 +4218,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0