libtool 1.3.0 patches, ok brad@
This commit is contained in:
wilfried
parent
67d1d99a54
commit
225675419f
86
infrastructure/patches/patch-lt1.3.0-ltconfig
Normal file
86
infrastructure/patches/patch-lt1.3.0-ltconfig
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
$OpenBSD: patch-lt1.3.0-ltconfig,v 1.1 2001/10/31 11:58:04 wilfried Exp $
|
||||||
|
--- ltconfig.orig Fri Mar 31 22:10:25 2000
|
||||||
|
+++ ltconfig Mon Oct 29 12:48:18 2001
|
||||||
|
@@ -499,7 +499,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', `OBJDUMP', and `AS', used on cygwin.
|
||||||
|
@@ -1061,7 +1068,9 @@ cygwin* | mingw*)
|
||||||
|
with_gnu_ld=no
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-
|
||||||
|
+openbsd*)
|
||||||
|
+ with_gnu_ld=no
|
||||||
|
+ ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
ld_shlibs=yes
|
||||||
|
@@ -1317,10 +1326,24 @@ else
|
||||||
|
;;
|
||||||
|
|
||||||
|
openbsd*)
|
||||||
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||||
|
- hardcode_libdir_flag_spec='-R$libdir'
|
||||||
|
hardcode_direct=yes
|
||||||
|
hardcode_shlibpath_var=no
|
||||||
|
+ 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}-R$libdir'
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
||||||
|
@@ -1857,9 +1880,25 @@ netbsd*)
|
||||||
|
|
||||||
|
openbsd*)
|
||||||
|
version_type=sunos
|
||||||
|
- if test "$with_gnu_ld" = yes; then
|
||||||
|
- need_lib_prefix=no
|
||||||
|
- need_version=no
|
||||||
|
+ 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'
|
||||||
90
infrastructure/patches/patch-lt1.3.0-ltmain_sh
Normal file
90
infrastructure/patches/patch-lt1.3.0-ltmain_sh
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
$OpenBSD: patch-lt1.3.0-ltmain_sh,v 1.1 2001/10/31 11:58:04 wilfried Exp $
|
||||||
|
--- ltmain.sh.orig Fri Mar 31 22:10:25 2000
|
||||||
|
+++ ltmain.sh Mon Oct 29 12:48:09 2001
|
||||||
|
@@ -1054,6 +1054,17 @@ compiler."
|
||||||
|
# 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
|
||||||
|
@@ -1066,6 +1077,17 @@ compiler."
|
||||||
|
deplibs="$deplibs $arg"
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -pthread)
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ deplibs="$deplibs $arg"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-module)
|
||||||
|
module=yes
|
||||||
|
continue
|
||||||
|
@@ -1763,6 +1785,9 @@ compiler."
|
||||||
|
*-*-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"
|
||||||
|
@@ -3437,40 +3462,6 @@ libdir='$install_libdir'\
|
||||||
|
# Exit here if they wanted silent mode.
|
||||||
|
test "$show" = : && exit 0
|
||||||
|
|
||||||
|
- echo "----------------------------------------------------------------------"
|
||||||
|
- echo "Libraries have been installed in:"
|
||||||
|
- for libdir in $libdirs; do
|
||||||
|
- echo " $libdir"
|
||||||
|
- done
|
||||||
|
- echo
|
||||||
|
- echo "If you ever happen to want to link against installed libraries"
|
||||||
|
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||||
|
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||||
|
- echo "flag during linking and do at least 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 -n "$admincmds"; then
|
||||||
|
- echo " - have your system administrator run these commands:$admincmds"
|
||||||
|
- 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
|
||||||
|
;;
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user