diff --git a/contrib/src/jsoncpp/SHA512SUMS b/contrib/src/jsoncpp/SHA512SUMS index 6f024bc036a61ba24ecb0b40ed9cc9930a5d3b4b..0356a0a3c243bbd1bdcbced048af7a2d21268206 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 ed07d40c91c738b507b5b100d2ae1b86ef939b49..6a8a41293b38f9ea7065c54fb6a98a3fb99f800a 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 $@