[Buildroot] [PATCH] libtomcrypt: fix build without wchar

[Buildroot] [PATCH] libtomcrypt: fix build without wchar

[Baruch Siach]

GCC defines wchar_t even when wchar support is disabled in uClibc. The
LTC_NO_WCHAR macro triggers a local definition of wchar_t that conflicts
with the GCC defined one. Remove LTC_NO_WCHAR to avoid that.

Fixes:
http://autobuild.buildroot.net/results/895/895452ac973cab0e0bc22636d39cbec7fbf598d3/
http://autobuild.buildroot.net/results/c82/c82d0173878e58f7192d3cec271b45763e6ea269/
http://autobuild.buildroot.net/results/83f/83f433bcb608b341fca2180afa57fc81495bc3b4/

Cc: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/libtomcrypt/libtomcrypt.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/libtomcrypt.mk
index 02610f16d669..020ce796fede 100644
--- a/package/libtomcrypt/libtomcrypt.mk
+++ b/package/libtomcrypt/libtomcrypt.mk
@@ -13,8 +13,7 @@ LIBTOMCRYPT_INSTALL_STAGING = YES
 LIBTOMCRYPT_INSTALL_TARGET = NO # only static library
 LIBTOMCRYPT_DEPENDENCIES = libtommath
 
-LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC \
-	$(if $(BR2_USE_WCHAR),,-DLTC_NO_WCHAR)
+LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC
 
 define LIBTOMCRYPT_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)"
-- 
2.14.2

[Buildroot] [PATCH] libtomcrypt: fix build without wchar

[François Perrad]

I also opened an upstream ticket (without fix),
see https://github.com/libtom/libtomcrypt/issues/313

Fran?ois

2017-10-17 14:12 GMT+02:00 Baruch Siach <baruch@tkos.co.il>:

> GCC defines wchar_t even when wchar support is disabled in uClibc. The
> LTC_NO_WCHAR macro triggers a local definition of wchar_t that conflicts
> with the GCC defined one. Remove LTC_NO_WCHAR to avoid that.
>
> Fixes:
> http://autobuild.buildroot.net/results/895/895452ac973cab0e0bc22636d39cbe
> c7fbf598d3/
> http://autobuild.buildroot.net/results/c82/c82d0173878e58f7192d3cec271b45
> 763e6ea269/
> http://autobuild.buildroot.net/results/83f/83f433bcb608b341fca2180afa57fc
> 81495bc3b4/
>
> Cc: Francois Perrad <francois.perrad@gadz.org>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/libtomcrypt/libtomcrypt.mk | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/
> libtomcrypt.mk
> index 02610f16d669..020ce796fede 100644
> --- a/package/libtomcrypt/libtomcrypt.mk
> +++ b/package/libtomcrypt/libtomcrypt.mk
> @@ -13,8 +13,7 @@ LIBTOMCRYPT_INSTALL_STAGING = YES
>  LIBTOMCRYPT_INSTALL_TARGET = NO # only static library
>  LIBTOMCRYPT_DEPENDENCIES = libtommath
>
> -LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE
> -DLTM_DESC \
> -       $(if $(BR2_USE_WCHAR),,-DLTC_NO_WCHAR)
> +LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE
> -DLTM_DESC
>
>  define LIBTOMCRYPT_BUILD_CMDS
>         $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
> CFLAGS="$(LIBTOMCRYPT_CFLAGS)"
> --
> 2.14.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171018/a7d1ea24/attachment.html>

[Buildroot] [PATCH] libtomcrypt: fix build without wchar

[Thomas Petazzoni]

Hello,

On Tue, 17 Oct 2017 15:12:55 +0300, Baruch Siach wrote:
> GCC defines wchar_t even when wchar support is disabled in uClibc. The
> LTC_NO_WCHAR macro triggers a local definition of wchar_t that conflicts
> with the GCC defined one. Remove LTC_NO_WCHAR to avoid that.
> 
> Fixes:
> http://autobuild.buildroot.net/results/895/895452ac973cab0e0bc22636d39cbec7fbf598d3/
> http://autobuild.buildroot.net/results/c82/c82d0173878e58f7192d3cec271b45763e6ea269/
> http://autobuild.buildroot.net/results/83f/83f433bcb608b341fca2180afa57fc81495bc3b4/
> 
> Cc: Francois Perrad <francois.perrad@gadz.org>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/libtomcrypt/libtomcrypt.mk | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied to master after updating the autobuilder reference to a result
that we still have in the database, and adding a reference to the
interesting Github discussion.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com