summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/cjson/cjson.hash3
-rw-r--r--package/cjson/cjson.mk8
2 files changed, 2 insertions, 9 deletions
diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash
index fc0ed28df6..a6370de75a 100644
--- a/package/cjson/cjson.hash
+++ b/package/cjson/cjson.hash
@@ -1,3 +1,2 @@
# Locally computed:
-sha256 3487795d54440bdbd41b4b8e7688889526f2f9a652639f6036b9965016c800e7 cjson-v1.1.0.tar.gz
-sha256 8eea780ee5729275a5076002d92a4c7854ecb89968b26a81efeb5bd9828268a0 fcc89c4bb264d665929b00eeebc479a643a90896.patch
+sha256 df549298ea6515058648eaacc62bcc4f82fa34f8b93af7753e30eb35c3841c7d cjson-v1.2.0.tar.gz
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 7ac7a71dcc..f0fe63b347 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -4,16 +4,10 @@
#
################################################################################
-CJSON_VERSION = v1.1.0
+CJSON_VERSION = v1.2.0
CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT
CJSON_LICENSE_FILES = LICENSE
-# This patch fixes -Werror=strict-overflow compile errors on sh4a and powerpc
-# toolchains:
-# http://autobuild.buildroot.net/results/3d899790acdc5c21733ff6f7f5a1b500e862ea0a
-CJSON_PATCH = \
- https://github.com/DaveGamble/cjson/commit/fcc89c4bb264d665929b00eeebc479a643a90896.patch
-
$(eval $(cmake-package))
OpenPOWER on IntegriCloud