sync libtool patches

This commit is contained in:
brad 2001-02-05 00:27:51 +00:00
parent aad83b0bb3
commit 12b9c4b720
2 changed files with 25 additions and 21 deletions

View File

@ -1,5 +1,5 @@
--- ltconfig.orig Fri Dec 8 21:02:00 2000
+++ ltconfig Fri Dec 8 21:05:29 2000
--- ltconfig.orig Fri Jan 5 02:13:13 2001
+++ ltconfig Sun Feb 4 19:25:53 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])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ 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 $linkopts'
+ 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*)
@@ -1997,13 +2008,10 @@
@@ -1997,13 +2011,10 @@
openbsd*)
version_type=sunos

View File

@ -1,15 +1,16 @@
--- ltmain.sh.orig Wed Jul 26 18:45:21 2000
+++ ltmain.sh Wed Jul 26 18:45:34 2000
@@ -2619,7 +2619,7 @@
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
@@ -3555,40 +3555,6 @@
--- ltmain.sh.orig Fri Jan 5 02:13:13 2001
+++ ltmain.sh Sun Feb 4 19:25:57 2001
@@ -1795,6 +1795,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.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3558,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0