sync libtool patches

This commit is contained in:
brad 2001-10-11 18:08:47 +00:00
parent 6307e485cc
commit 2c2aac42b5
2 changed files with 72 additions and 28 deletions

View File

@ -1,16 +1,33 @@
--- ltconfig.orig Fri Apr 9 02:12:57 1999
+++ ltconfig Sun Feb 18 10:23:30 2001
@@ -1030,6 +1030,9 @@
+++ ltconfig Thu Oct 11 09:39:00 2001
@@ -484,7 +484,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL' and `AS', used on cygwin.
@@ -1030,7 +1037,9 @@ cygwin* | mingw*)
freebsd2* | sunos4*)
exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1262,10 +1265,21 @@
ld_shlibs=yes
@@ -1262,10 +1271,24 @@ else
;;
openbsd*)
@ -18,34 +35,51 @@
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ 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
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -1789,13 +1803,10 @@
@@ -1789,9 +1812,25 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Fri Apr 9 02:12:58 1999
+++ ltmain.sh Sun Feb 18 10:46:24 2001
@@ -1010,6 +1010,25 @@
+++ ltmain.sh Thu Oct 11 12:46:12 2001
@@ -1010,9 +1010,35 @@ compiler."
;;
-l*)
@ -19,14 +19,24 @@
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
deplibs="$deplibs $arg"
;;
@@ -1702,6 +1721,9 @@
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
if test "$module" != yes; then
module=yes
@@ -1702,6 +1728,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2*)
# these systems don't actually have a c library (as such)!
;;
@ -36,7 +46,7 @@
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3326,40 +3348,6 @@
@@ -3326,40 +3355,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0