From 2f256545044762877129027bec1518669dcd7b7d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 17 Oct 2017 15:12:55 +0300 Subject: [PATCH] libtomcrypt: fix build without wchar 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. See also https://github.com/libtom/libtomcrypt/issues/313 for more discussion about this. Fixes: http://autobuild.buildroot.net/results/4ff/4ffb593185f7520d2d9a9cc988aa9c510f253930/ Cc: Francois Perrad Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- 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 02610f16d6..020ce796fe 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.30.2