From 1fa8dfe69cdba01f01899f9fd4735cd161142ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Tue, 6 Sep 2022 15:38:58 -0400 Subject: [PATCH] contrib: homogeneize jsoncpp versions across platforms Seems that JSONcpp symbols changed between 1.7.4/1.7.6 causing some versions to fail. We already uses 1.9.3 since a long time on other platforms and ubuntu 22 got a version recent enough too. Change-Id: I21a4c44ee1359a7d89e45770cb2bad9f2eb00cce GitLab: #824 --- contrib/src/jsoncpp/rules.mak | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contrib/src/jsoncpp/rules.mak b/contrib/src/jsoncpp/rules.mak index 6ce2b7e71..67ba98d6d 100644 --- a/contrib/src/jsoncpp/rules.mak +++ b/contrib/src/jsoncpp/rules.mak @@ -1,19 +1,11 @@ # JSONCPP -ifdef HAVE_ANDROID JSONCPP_VERSION := 1.9.3 -else -ifdef HAVE_LINUX -JSONCPP_VERSION := 1.7.2 -else -JSONCPP_VERSION := 1.9.3 -endif -endif JSONCPP_URL := https://github.com/open-source-parsers/jsoncpp/archive/$(JSONCPP_VERSION).tar.gz PKGS += jsoncpp -ifeq ($(call need_pkg,"jsoncpp >= 1.7.2"),) +ifeq ($(call need_pkg,"jsoncpp >= 1.9.3"),) PKGS_FOUND += jsoncpp endif