1 [PATCH] libubox: drop legacy json-c support
3 The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all
4 modules are found), and the legacy libjson.so name is also used by the other
5 libjson (http://sourceforge.net/projects/libjson/) which provides an
6 incompatible API, so just drop it.
8 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
10 CMakeLists.txt | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
13 Index: libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b/CMakeLists.txt
14 ===================================================================
15 --- libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b.orig/CMakeLists.txt
16 +++ libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b/CMakeLists.txt
20 INCLUDE(FindPkgConfig)
21 -PKG_CHECK_MODULES(JSONC json-c json)
22 +PKG_CHECK_MODULES(JSONC json-c)
24 ADD_DEFINITIONS(-DJSONC)
25 INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
30 -find_library(json NAMES json-c json)
31 +find_library(json NAMES json-c)
33 ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
34 TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})