[Buildroot] [git commit branch/2019.08.x] package/mono: add libunwind optional dependency
Peter Korsgaard
peter at korsgaard.com
Thu Oct 31 14:30:05 UTC 2019
commit: https://git.buildroot.net/buildroot/commit/?id=ffd14c8d4b514965c3fb25d57674af7e67b96bff
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.08.x
Add libunwind dependency as well as a patch to link with it
Fixes:
- http://autobuild.buildroot.net/results/dbd64c89815d393a4e28b312d74fd80ee6de92da
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
(cherry picked from commit 0bf8baa5877b6b2327a9266f6f96e5c9294b7e9e)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
.../0003-configure.ac-checks-for-libunwind.patch | 40 ++++++++++++++++++++++
package/mono/mono.mk | 4 ++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/package/mono/0003-configure.ac-checks-for-libunwind.patch b/package/mono/0003-configure.ac-checks-for-libunwind.patch
new file mode 100644
index 0000000000..8ff6b2f5c7
--- /dev/null
+++ b/package/mono/0003-configure.ac-checks-for-libunwind.patch
@@ -0,0 +1,40 @@
+From 4dc1d1fe553f3a8ad00919324419aba54675239e Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
+Date: Wed, 15 May 2019 22:30:01 +0200
+Subject: [PATCH] configure.ac: checks for libunwind
+
+_Unwind_GetIP is used in build_stack_trace however this function can be
+provided by libunwind so check for it to avoid the following build
+failure:
+
+/home/buildroot/autobuild/run/instance-1/output/host/lib/gcc/arm-buildroot-linux-musleabihf/7.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: ./.libs/libmini.a(libmini_la-mini-exceptions.o): in function `build_stack_trace':
+/home/buildroot/autobuild/run/instance-1/output/build/mono-5.20.1.27/mono/mini/mini-exceptions.c:365: undefined reference to `_Unwind_GetIP'
+collect2: error: ld returned 1 exit status
+
+Fixes:
+ - http://autobuild.buildroot.net/results/dbd64c89815d393a4e28b312d74fd80ee6de92da
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
+---
+ configure.ac | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d724f9e2d27..c3067246f08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2206,6 +2206,11 @@ if test x$host_win32 = xno; then
+ dnl *****************************
+ AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
+
++ dnl *****************************
++ dnl *** Checks for libunwind ***
++ dnl ****************************
++ AC_CHECK_LIB(unwind, _Unwind_GetIP, LIBS="$LIBS -lunwind")
++
+ case "$host" in
+ *-*-*freebsd*)
+ dnl *****************************
+--
+2.20.1
+
diff --git a/package/mono/mono.mk b/package/mono/mono.mk
index 96b9c63689..a65963a259 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -40,7 +40,9 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
MONO_DEPENDENCIES += libiconv
endif
-MONO_DEPENDENCIES += host-mono
+MONO_DEPENDENCIES += \
+ host-mono \
+ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind)
## Mono managed
More information about the buildroot
mailing list