6683772531
-- Workaround for the libtool relinking problem thanks to Marc Matteo
108 lines
3.3 KiB
Plaintext
108 lines
3.3 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
|
|
--- aclocal.m4.orig Thu Apr 18 18:52:35 2002
|
|
+++ aclocal.m4 Sun May 26 12:45:36 2002
|
|
@@ -863,8 +863,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
|
old_postuninstall_cmds=
|
|
|
|
if test -n "$RANLIB"; then
|
|
+ case $host_os in
|
|
+ openbsd*)
|
|
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ *)
|
|
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ esac
|
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
fi
|
|
|
|
# Allow CC to be a program name with arguments.
|
|
@@ -1259,7 +1266,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* )
|
|
+cygwin* | mingw* | pw32*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -1267,7 +1274,9 @@ cygwin* | mingw* | pw32* )
|
|
with_gnu_ld=no
|
|
fi
|
|
;;
|
|
-
|
|
+openbsd*)
|
|
+ with_gnu_ld=no
|
|
+ ;;
|
|
esac
|
|
|
|
ld_shlibs=yes
|
|
@@ -1671,10 +1680,24 @@ else
|
|
;;
|
|
|
|
openbsd*)
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
- 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 $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath,$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 $linker_flags'
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
+ ;;
|
|
+ *)
|
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
+ ;;
|
|
+ esac
|
|
+ fi
|
|
;;
|
|
|
|
os2*)
|
|
@@ -2148,9 +2171,19 @@ newsos6)
|
|
|
|
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
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ case "$host_os" in
|
|
+ openbsd2.[[89]] | openbsd2.[[89]].*)
|
|
+ shlibpath_overrides_runpath=no
|
|
+ ;;
|
|
+ *)
|
|
+ shlibpath_overrides_runpath=yes
|
|
+ ;;
|
|
+ esac
|
|
+ else
|
|
+ shlibpath_overrides_runpath=yes
|
|
fi
|
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
@@ -3281,6 +3314,16 @@ newos6*)
|
|
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
|
|
lt_cv_file_magic_cmd=/usr/bin/file
|
|
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
|
+ ;;
|
|
+
|
|
+openbsd*)
|
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
|
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
|
+ else
|
|
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
+ fi
|
|
;;
|
|
|
|
osf3* | osf4* | osf5*)
|