mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-24 05:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/mono: add libunwind optional dependency

Browse Source 
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@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2019-05-15 22:47:21 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent d5bcb30cf9
commit 0bf8baa587
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/mono/0003-configure.ac-checks-for-libunwind.patch Normal file
View File

@ -0,0 +1,40 @@
From 4dc1d1fe553f3a8ad00919324419aba54675239e Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@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@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

4
package/mono/mono.mk
View File

@ -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