On Tue, Aug 21, 2012 at 11:50:21PM -0400, Brad Smith wrote:
> The following diff adds support for Bitrig, which is a
> fork of OpenBSD.
Any comments?
> diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
> index 1d71f0e..28398fd 100644
> --- a/build-aux/ltmain.m4sh
> +++ b/build-aux/ltmain.m4sh
> @@ -4849,7 +4849,7 @@ func_mode_link ()
> # These systems don't actually have a C library (as such)
> test X-lc = "X$arg" && continue
> ;;
> - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
> + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
> # Do not include libc due to us having libc/libc_r.
> test X-lc = "X$arg" && continue
> ;;
> @@ -6879,7 +6879,7 @@ func_mode_link ()
> *-*-netbsd*)
> # Don't link with libc until the a.out ld.so is fixed.
> ;;
> - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
> + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
> # Do not include libc due to us having libc/libc_r.
> ;;
> *-*-sco3.2v5* | *-*-sco5v6*)
> diff --git a/m4/libtool.m4 b/m4/libtool.m4
> index bd0bb9e..1b5012f 100644
> --- a/m4/libtool.m4
> +++ b/m4/libtool.m4
> @@ -1474,7 +1474,7 @@ old_postuninstall_cmds=
>
> if test -n "$RANLIB"; then
> case $host_os in
> - openbsd*)
> + openbsd* | bitrig*)
> old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
> ;;
> *)
> @@ -1642,7 +1642,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
> lt_cv_sys_max_cmd_len=8192;
> ;;
>
> - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
> + netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | bitrig*)
> # This has been around since 386BSD, at least. Likely further.
> if test -x /sbin/sysctl; then
> lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
> @@ -2715,7 +2715,7 @@ newsos6)
> dynamic_linker='ldqnx.so'
> ;;
>
> -openbsd*)
> +openbsd* | bitrig*)
> version_type=sunos
> sys_lib_dlsearch_path_spec=/usr/lib
> need_lib_prefix=no
> @@ -3286,7 +3286,7 @@ newos6*)
> lt_cv_deplibs_check_method=pass_all
> ;;
>
> -openbsd*)
> +openbsd* | bitrig*)
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
> lt_cv_deplibs_check_method='match_pattern
> /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
> else
> @@ -4632,7 +4632,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
> # we just hope/assume this is gcc and not c89 (= MSVC++)
> with_gnu_ld=yes
> ;;
> - openbsd*)
> + openbsd* | bitrig*)
> with_gnu_ld=no
> ;;
> esac
> @@ -5361,7 +5361,7 @@ _LT_EOF
> *nto* | *qnx*)
> ;;
>
> - openbsd*)
> + openbsd* | bitrig*)
> if test -f /usr/libexec/ld.so; then
> _LT_TAGVAR(hardcode_direct, $1)=yes
> _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
> @@ -6553,7 +6553,7 @@ if test yes != "$_lt_caught_CXX_error"; then
> _LT_TAGVAR(ld_shlibs, $1)=yes
> ;;
>
> - openbsd*)
> + openbsd* | bitrig*)
> if test -f /usr/libexec/ld.so; then
> _LT_TAGVAR(hardcode_direct, $1)=yes
> _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
> diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
> index 6cb5727..9b2a535 100644
> --- a/m4/ltdl.m4
> +++ b/m4/ltdl.m4
> @@ -496,7 +496,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
> netbsd*)
> lt_cv_sys_dlopen_deplibs=yes
> ;;
> - openbsd*)
> + openbsd* | bitrig*)
> lt_cv_sys_dlopen_deplibs=yes
> ;;
> osf[[1234]]*)
> diff --git a/tests/deplibs-ident.at b/tests/deplibs-ident.at
> index 5758311..c47586a 100644
> --- a/tests/deplibs-ident.at
> +++ b/tests/deplibs-ident.at
> @@ -67,7 +67,7 @@ int main() { return a1() + a2() + a3() + c(); }
> [0],[stdout],[ignore])
> AT_CHECK([$EGREP 'cee.*cee' stdout], 1, [ignore], [ignore])
> AT_XFAIL_IF([case $host in
> - *-*-aix*|hppa*-*-hpux*|*-*-interix*|*-*-openbsd*) false;;
> +
> *-*-aix*|hppa*-*-hpux*|*-*-interix*|*-*-openbsd*|*-*-bitrig*) false;;
> *):;;
> esac])
> dnl This is currently broken in libtool
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
