From 4d46e99e29c90eca929c88c2833b73b10361ae1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 6 Apr 2025 13:04:47 -0400
Subject: [PATCH] contrib: update jsoncpp
Gitlab: #1122
Change-Id: Ia80eb6f1b90c663419a6cbe25f416afee742e3c3
---
contrib/src/jsoncpp/SHA512SUMS | 3 +--
contrib/src/jsoncpp/rules.mak | 7 ++++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/src/jsoncpp/SHA512SUMS b/contrib/src/jsoncpp/SHA512SUMS
index 6f024bc036..0356a0a3c2 100644
--- a/contrib/src/jsoncpp/SHA512SUMS
+++ b/contrib/src/jsoncpp/SHA512SUMS
@@ -1,2 +1 @@
-32702147229ea7a3679654325572c38f4188f258ab6ac21f9e04059d53ef2a7cd0542ec4ec3b0e7b9089acd2b7bce389f16b9ff24b2e63e0ba2a5bcd46bab766 jsoncpp-1.7.2.tar.gz
-f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559 jsoncpp-1.9.3.tar.gz
\ No newline at end of file
+006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08 jsoncpp-1.9.6.tar.gz
\ No newline at end of file
diff --git a/contrib/src/jsoncpp/rules.mak b/contrib/src/jsoncpp/rules.mak
index ed07d40c91..6a8a41293b 100644
--- a/contrib/src/jsoncpp/rules.mak
+++ b/contrib/src/jsoncpp/rules.mak
@@ -1,5 +1,5 @@
# JSONCPP
-JSONCPP_VERSION := 1.9.3
+JSONCPP_VERSION := 1.9.6
PKG_CPE += cpe:2.3:a:jsoncpp_project:jsoncpp:$(JSONCPP_VERSION):*:*:*:*:*:*:*
JSONCPP_URL := https://github.com/open-source-parsers/jsoncpp/archive/$(JSONCPP_VERSION).tar.gz
@@ -24,6 +24,7 @@ jsoncpp: jsoncpp-$(JSONCPP_VERSION).tar.gz .sum-jsoncpp
$(MOVE)
.jsoncpp: jsoncpp toolchain.cmake
- cd $< && $(HOSTVARS) $(CMAKE) ${JSONCPP_CMAKECONF}
- cd $< && $(MAKE) install
+ cd $< && mkdir -p build
+ cd $< && cd build && $(HOSTVARS) $(CMAKE) .. ${JSONCPP_CMAKECONF}
+ cd $< && cd build && $(MAKE) install
touch $@
--
GitLab