From: Bernd Kuhls Date: Wed, 4 Sep 2019 21:02:37 +0000 (+0200) Subject: package/jsoncpp: switch build system to meson X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3651d4baa3f850bb0b69948b9f2338a44bb1f61c;p=buildroot.git package/jsoncpp: switch build system to meson Bumping jsoncpp to 1.9.1 will cause a CMake-related build error: https://github.com/open-source-parsers/jsoncpp/issues/970 To fix the bug upstream suggests to switch to meson: "Our official policy has been only supporting the meson build, and having users submit fixes for the CMake build." https://github.com/open-source-parsers/jsoncpp/issues/970#issuecomment-509794015 Remove all _CONF_OPTS as they are not supported by meson. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 2b527fc303..d54b31a8d6 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -10,15 +10,4 @@ JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE JSONCPP_INSTALL_STAGING = YES -JSONCPP_CONF_OPTS += \ - -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -DJSONCPP_WITH_TESTS=OFF \ - -DJSONCPP_WITH_STRICT_ISO=OFF - -ifeq ($(BR2_SHARED_LIBS),y) -JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -else -JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -endif - -$(eval $(cmake-package)) +$(eval $(meson-package))