From 877b5bd19a11cd0a16a2a0a512a7693e32960083 Mon Sep 17 00:00:00 2001 From: pvalchev Date: Sun, 10 Feb 2002 07:47:42 +0000 Subject: [PATCH] fix up libtool on ELF arches (doesn't solve all problems yet); talked to maintainer --- audio/xmms/patches/patch-aclocal_m4 | 32 +++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/audio/xmms/patches/patch-aclocal_m4 b/audio/xmms/patches/patch-aclocal_m4 index 6f6ff9d3c15..a0915593a2f 100644 --- a/audio/xmms/patches/patch-aclocal_m4 +++ b/audio/xmms/patches/patch-aclocal_m4 @@ -1,7 +1,31 @@ -$OpenBSD: patch-aclocal_m4,v 1.1 2001/07/25 15:48:26 naddy Exp $ ---- aclocal.m4.orig Mon Jun 18 21:53:38 2001 -+++ aclocal.m4 Wed Jul 25 16:48:15 2001 -@@ -2059,10 +2059,9 @@ AC_DEFUN(AM_WITH_NLS, +$OpenBSD: patch-aclocal_m4,v 1.2 2002/02/10 07:47:42 pvalchev Exp $ +--- aclocal.m4.orig Tue Jan 8 09:14:00 2002 ++++ aclocal.m4 Thu Feb 7 13:40:31 2002 +@@ -3211,9 +3211,14 @@ openbsd*) + version_type=sunos + 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 -z "`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]].*) ++ openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) +@@ -3221,6 +3226,7 @@ openbsd*) + ;; + 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' +@@ -5131,10 +5137,9 @@ AC_DEFUN(AM_WITH_NLS, if test "$gt_cv_func_gettext_libc" != "yes"; then AC_CHECK_LIB(intl, bindtextdomain,