From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 18 Apr 2020 10:56:14 +0000 (+0200)
Subject: m4: Fix configuration of libunwind on i386 (and probably other systems).
X-Git-Tag: 2.3.14.rc1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a7f625eedb4bbae564fb773359eec1f6658ede3;p=thirdparty%2Fdovecot%2Fcore.git

m4: Fix configuration of libunwind on i386 (and probably other systems).

Use the standard libunwind-coredump instead of the system-dependent library.
This way, all can be configured using pkg-config, without relying on a failed
attempt to use the $build_cpu variable to find the system-dependent library.
This fails on i386 and probably other systems as well.
---

diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4
index 4b7989e7fc..cadb62b71d 100644
--- a/m4/want_unwind.m4
+++ b/m4/want_unwind.m4
@@ -2,17 +2,9 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [
   have_libunwind=no
   AS_IF([test "$want_libunwind" != "no"], [
     PKG_CHECK_EXISTS([libunwind], [
-      PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[
-        dnl see if there is target-specific library
-        AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[
-          have_libunwind=yes
-          LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}"
-          AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
-        ],[
-           have_libunwind=no
-           LIBUNWIND_LIBS=""
-           LIBUNWIND_CFLAGS=""
-        ])
+      PKG_CHECK_MODULES([LIBUNWIND], [libunwind-generic],[
+        have_libunwind=yes
+	AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
       ])
      ])
   ])
diff --git a/run-test-valgrind.supp b/run-test-valgrind.supp
index d7f2e98260..96544884b5 100644
--- a/run-test-valgrind.supp
+++ b/run-test-valgrind.supp
@@ -60,9 +60,9 @@
    Memcheck:Param
    msync(start)
    ...
-   obj:/usr/lib/x86_64-linux-gnu/libunwind-x86_64.so.8.0.1
-   fun:_Ux86_64_step
-   fun:backtrace_append_unwind
+   obj:*libunwind*
+   ...
+   fun:backtrace_append
    ...
 }
 {