From: Gustavo Zacarias Date: Mon, 26 Jan 2015 14:17:38 +0000 (-0300) Subject: benejson: fix for non-wchar toolchains X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de5082fa21f4fcb28da0215d0f529b1165d73f9a;p=buildroot.git benejson: fix for non-wchar toolchains wchar needs to be disabled in order for it to build on !wchar. Fixes: http://autobuild.buildroot.net/results/71f/71f19d5056b56d40463b9fef7fa859e0025c4991/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 75753d2da4..2b8d09d301 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -9,9 +9,17 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) BENEJSON_LICENSE = MIT BENEJSON_LICENSE_FILES = LICENSE BENEJSON_INSTALL_STAGING = YES - BENEJSON_DEPENDENCIES = host-scons +# wchar support needs to be manually disabled +ifeq ($(BR2_USE_WCHAR),) +define BENEJSON_DISABLE_WCHAR + $(SED) 's,^#define BNJ_WCHAR_SUPPORT,#undef BNJ_WCHAR_SUPPORT,' \ + $(@D)/benejson/benejson.h +endef +BENEJSON_POST_PATCH_HOOKS += BENEJSON_DISABLE_WCHAR +endif + define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \