[Buildroot] [PATCH 1/1] package/mono: force internal libatomic-ops for some arm variants

Illia Bitkov illia.bitkov at mind.be
Wed Aug 18 19:03:45 UTC 2021


Fixes:
http://autobuild.buildroot.net/results/18b017dd5b9c1d8d6c91303ea4f1fdd3e1b086e0/
http://autobuild.buildroot.net/results/1d262e9ad5bf8bf437bc3f2a709d84acf854d298/
Signed-off-by: Illia Bitkov <illia.bitkov at mind.be>
---
 package/mono/Config.in |  2 +-
 package/mono/mono.mk   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/mono/Config.in b/package/mono/Config.in
index 44b8cf8581..3f26bd4092 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -16,7 +16,7 @@ config BR2_PACKAGE_MONO
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_LIBATOMIC_OPS
+	select BR2_PACKAGE_LIBATOMIC_OPS if !BR2_xscale && !BR2_arm926t
 	help
 	  An open source, cross-platform, implementation of C#
 	  and the CLR that is binary compatible with Microsoft.NET.
diff --git a/package/mono/mono.mk b/package/mono/mono.mk
index 27f7886224..e697ed7ea2 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -43,8 +43,14 @@ endif
 
 MONO_DEPENDENCIES += \
 	host-mono \
-	$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
-	libatomic_ops
+	$(if $(BR2_PACKAGE_LIBUNWIND),libunwind)
+
+ifeq ($(BR2_xscale)$(BR2_arm926t),nn)
+MONO_DEPENDENCIES += libatomic_ops
+else
+#force use of internal libatomic-ops
+MONO_CONF_OPTS += --with-libatomic-ops=no
+endif
 
 ## Mono managed
 
-- 
2.25.1



More information about the buildroot mailing list