removed with 0.15:
- BUILD_DOCUMENTATION

added with 0.15:
- DISABLE_THREAD_LOCAL_STORAGE
- OVERRIDE_GET_RANDOM_SEED

added with 0.16:
- DISABLE_JSON_POINTER

added with 0.17:
- BUILD_APPS
- DISABLE_JSON_PATCH
- NEWLOCALE_NEEDS_FREELOCALE

After changing json-c.make sync the changes to host-json-c.make …

Fixes: b6ac44c56bef ("json-c: version bump 0.14 -> 0.15")
Fixes: ecd364618410 ("json-c: version bump 0.15 -> 0.16")
Fixes: ee8afdbc3ea7 ("json-c: Version bump. 0.16 -> 0.17")
Signed-off-by: Alexander Dahl <[email protected]>
---
 rules/host-json-c.make | 11 +++++++++--
 rules/json-c.make      |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/rules/host-json-c.make b/rules/host-json-c.make
index 8e607f783..dc45e28ba 100644
--- a/rules/host-json-c.make
+++ b/rules/host-json-c.make
@@ -18,12 +18,19 @@ HOST_PACKAGES-$(PTXCONF_HOST_JSON_C) += host-json-c
 HOST_JSON_C_CONF_TOOL  := cmake
 HOST_JSON_C_CONF_OPT   := \
        $(HOST_CMAKE_OPT) \
-       -DBUILD_DOCUMENTATION:BOOL=OFF \
+       -DBUILD_APPS:BOOL=OFF \
        -DBUILD_SHARED_LIBS:BOOL=ON \
+       -DBUILD_STATIC_LIBS:BOOL=OFF \
        -DBUILD_TESTING:BOOL=OFF \
        -DDISABLE_BSYMBOLIC:BOOL=ON \
+       -DDISABLE_EXTRA_LIBS:BOOL=ON \
+       -DDISABLE_JSON_PATCH=OFF \
+       -DDISABLE_JSON_POINTER=OFF \
+       -DDISABLE_THREAD_LOCAL_STORAGE=OFF \
        -DDISABLE_WERROR:BOOL=ON \
        -DENABLE_RDRAND:BOOL=OFF \
-       -DENABLE_THREADING:BOOL=OFF
+       -DENABLE_THREADING:BOOL=OFF \
+       -DNEWLOCALE_NEEDS_FREELOCALE=OFF \
+       -DOVERRIDE_GET_RANDOM_SEED=OFF
 
 # vim: syntax=make
diff --git a/rules/json-c.make b/rules/json-c.make
index f5850724a..024375c61 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -31,15 +31,20 @@ JSON_C_LICENSE_FILES        := 
file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
 JSON_C_CONF_TOOL       := cmake
 JSON_C_CONF_OPT                := \
        $(CROSS_CMAKE_USR) \
-       -DBUILD_DOCUMENTATION:BOOL=OFF \
+       -DBUILD_APPS:BOOL=OFF \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DBUILD_STATIC_LIBS:BOOL=OFF \
        -DBUILD_TESTING:BOOL=OFF \
        -DDISABLE_BSYMBOLIC:BOOL=ON \
        -DDISABLE_EXTRA_LIBS:BOOL=ON \
+       -DDISABLE_JSON_PATCH=OFF \
+       -DDISABLE_JSON_POINTER=OFF \
+       -DDISABLE_THREAD_LOCAL_STORAGE=OFF \
        -DDISABLE_WERROR:BOOL=ON \
        -DENABLE_RDRAND:BOOL=OFF \
-       -DENABLE_THREADING:BOOL=OFF
+       -DENABLE_THREADING:BOOL=OFF \
+       -DNEWLOCALE_NEEDS_FREELOCALE=OFF \
+       -DOVERRIDE_GET_RANDOM_SEED=OFF
 
 # ----------------------------------------------------------------------------
 # Install
-- 
2.47.3


Reply via email to