aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Angelo Compagnucci <angelo.compagnucci@gmail.com>2015-07-27 12:06:24 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-27 23:19:55 +0200
commita35b7c4e91be9ffe02fe96cb66148fa5d53d3325 (patch)
treeca122ec364cb920e4d5c9f3c80403a50aaa2aeb8
parentefc54fe91ebd849618a15363602b84e53e15037d (diff)
downloadbuildroot-a35b7c4e91be9ffe02fe96cb66148fa5d53d3325.tar.gz
buildroot-a35b7c4e91be9ffe02fe96cb66148fa5d53d3325.tar.bz2
package/mono: fixing missing locale
This patch fixes compilation error in case of a missing locale in toolchain. Fixes: http://autobuild.buildroot.net/results/a0fc33a4ed90844f9529acc76a6ba183fe253771/ http://autobuild.buildroot.net/results/3ff839e894f0b8f9c2e3af9629d45e8efc09aecd/ http://autobuild.buildroot.net/results/5e11117048d965bc1fc44c738bb51f11164304af/ Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mono/Config.in1
-rw-r--r--package/mono/mono.mk4
2 files changed, 5 insertions, 0 deletions
diff --git a/package/mono/Config.in b/package/mono/Config.in
index 4445f4b010..0c7129b91a 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MONO
bool "mono"
depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
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 9cb8564109..8668aa0d05 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -36,6 +36,10 @@ endef
MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MONO_DEPENDENCIES += libiconv
+endif
+
MONO_DEPENDENCIES += host-mono
## Mono managed