From 31d6e25c5fcbe3df6c404d283b3598e9aa5ef95a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 11 Nov 2022 06:33:08 -0500 Subject: [PATCH] config: merge includes recursively Signed-off-by: Steffen Vogel --- CMakeLists.txt | 2 +- lib/config.cpp | 2 +- packaging/deps.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 263529558..01b182e1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ endif() set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig") -pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.9) +pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.13) pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET REQUIRED libwebsockets>=3.1.0) pkg_check_modules(PROTOBUF IMPORTED_TARGET protobuf>=2.6.0) pkg_check_modules(PROTOBUFC IMPORTED_TARGET libprotobuf-c>=1.1.0) diff --git a/lib/config.cpp b/lib/config.cpp index 5a6d62d0e..2c2e8a699 100644 --- a/lib/config.cpp +++ b/lib/config.cpp @@ -353,7 +353,7 @@ json_t * Config::expandIncludes(json_t *in) if (!incl) incl = other; else if (json_is_object(incl) && json_is_object(other)) { - ret = json_object_update(incl, other); + ret = json_object_update_recursive(incl, other); if (ret) throw ConfigError(str, "Can not mix object and array-typed include files"); } diff --git a/packaging/deps.sh b/packaging/deps.sh index dca16833e..765964f3b 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -49,7 +49,7 @@ if ! pkg-config "criterion >= 2.3.1" && \ fi # Build & Install libjansson -if ! pkg-config "jansson >= 2.7" && \ +if ! pkg-config "jansson >= 2.13" && \ [ -z "${SKIP_JANSSON}" ]; then git clone ${GIT_OPTS} --branch v2.14 https://github.com/akheron/jansson pushd jansson