[PATCH] rpcd CMakeLists.txt: drop legacy json-c support

Rosen Penev rosenp at gmail.com
Tue Jan 19 05:40:54 EST 2021


On Mon, Jan 18, 2021 at 11:21 PM Sergey Ponomarev <stokito at gmail.com> wrote:
>
> The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules are found), and the legacy libjson.so name is also used by the other libjson (http://sourceforge.net/projects/libjson/) which provides an incompatible API, so just drop it.
>
> Backported from libubox cbf80de7f4df61960f386cb01a899cf4228d38f3
>
> Signed-off-by: Sergey Ponomarev <stokito at gmail.com>
Reviewed-by: Rosen Penev <rosenp at gmail.com>
> ---
>  CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 26e011e..266dbe4 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -26,7 +26,7 @@ FIND_LIBRARY(uci NAMES uci)
>  FIND_LIBRARY(ubus NAMES ubus)
>  FIND_LIBRARY(ubox NAMES ubox)
>  FIND_LIBRARY(blobmsg_json NAMES blobmsg_json)
> -FIND_LIBRARY(json NAMES json-c json)
> +FIND_LIBRARY(json NAMES json-c)
>  FIND_LIBRARY(crypt NAMES crypt)
>  IF(crypt STREQUAL "crypt-NOTFOUND")
>    SET(crypt "")
> --
> 2.27.0
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list