add libtool patches

This commit is contained in:
brad 2001-06-03 21:39:30 +00:00
parent eaf9d360a0
commit d2adeb778b
2 changed files with 124 additions and 0 deletions

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-scripts_ltconfig,v 1.1 2001/06/03 21:39:30 brad Exp $
--- scripts/ltconfig.orig Thu May 7 21:41:18 1998
+++ scripts/ltconfig Sun Jun 3 17:07:16 2001
@@ -702,7 +702,7 @@ hardcode_shlibpath_var=unsupported
runpath_var=
case "$host_os" in
-amigaos* | sunos4*)
+amigaos* | sunos4* | openbsd*)
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
@@ -815,10 +815,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib$libobjs'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib$libobjs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
+ 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*)

View File

@ -0,0 +1,88 @@
$OpenBSD: patch-scripts_ltmain_sh,v 1.1 2001/06/03 21:39:30 brad Exp $
--- scripts/ltmain.sh.orig Sun Jun 3 17:08:12 2001
+++ scripts/ltmain.sh Sun Jun 3 17:15:33 2001
@@ -506,7 +506,28 @@ if test -z "$show_help"; then
deplibs="$deplibs $arg"
;;
- -l*) deplibs="$deplibs $arg" ;;
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-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
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
-no-undefined)
allow_undefined=no
@@ -1002,7 +1023,15 @@ if test -z "$show_help"; then
# Add libc to deplibs on all systems.
dependency_libs="$deplibs"
- deplibs="$deplibs -lc"
+ case "$host_os" in
+ openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2023,37 +2052,6 @@ libdir='$install_libdir'\
done
fi
- echo "------------------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "To link against installed libraries in a given directory, LIBDIR,"
- echo "you must use the \`-LLIBDIR' flag during linking."
- echo
- echo " You will also need to do one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "------------------------------------------------------------------------------"
exit 0
;;