From aca8412ce27fdb216e80145933baa13c15118719 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Dec 2017 17:29:33 +0100 Subject: [PATCH] cjson: build shared and static library cjson 1.6.0 added the BUILD_SHARED_AND_STATIC_LIBS option which is OFF by default so set it depending on BR2_SHARED_STATIC_LIBS value. If BUILD_SHARED_AND_STATIC_LIBS is set to OFF, cjson uses the standard BUILD_SHARED_LIBS option which is passed by the cmake-package infrastructure. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cjson/cjson.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index f3ef7fd2ac..aabf3677ea 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -15,4 +15,10 @@ CJSON_CONF_OPTS += \ -DENABLE_CJSON_TEST=OFF \ -DENABLE_CUSTOM_COMPILER_FLAGS=OFF +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=ON +else +CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=OFF +endif + $(eval $(cmake-package)) -- 2.30.2