diff mbox

[v2] package/mono: fixing missing locale

Message ID 1437991584-27267-1-git-send-email-angelo.compagnucci@gmail.com
State Accepted
Headers show

Commit Message

Angelo Compagnucci July 27, 2015, 10:06 a.m. UTC
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>
---
Changes:

v1->v2:
 * Added libiconv mono dependency as suggested by Thomas

 package/mono/Config.in | 1 +
 package/mono/mono.mk   | 4 ++++
 2 files changed, 5 insertions(+)

Comments

Thomas Petazzoni July 27, 2015, 9:20 p.m. UTC | #1
Dear Angelo Compagnucci,

On Mon, 27 Jul 2015 12:06:24 +0200, Angelo Compagnucci wrote:
> 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>
> ---
> Changes:

Applied, thanks.

Thomas
Thomas Petazzoni July 28, 2015, 9 p.m. UTC | #2
Dear Angelo Compagnucci,

On Mon, 27 Jul 2015 12:06:24 +0200, Angelo Compagnucci wrote:
> 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>

This patch didn't fix the problem. See:

  http://autobuild.buildroot.org/results/aeb/aebfbd4e7fe46edbd3798563df28b4d89903becd/build-end.log

This build was done with Git commit
2a2ee97d1698ba1a624fb0b48655e9b17c395263, which does have your patch
applied.

Can you have a look?

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/mono/Config.in b/package/mono/Config.in
index 4445f4b..0c7129b 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 9cb8564..8668aa0 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