diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2016-12-03 20:47:45 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-12-04 15:40:07 +0100 |
| commit | c8824a428b12c433e47e525978fe2ad216a074e3 (patch) | |
| tree | a1e059be4d927f8dfb5b75e2619b3b20f92d6d68 /package/cjson | |
| parent | 40685f6a51fcba41721e0b798393cb0b01dfe27b (diff) | |
| download | buildroot-c8824a428b12c433e47e525978fe2ad216a074e3.tar.gz buildroot-c8824a428b12c433e47e525978fe2ad216a074e3.zip | |
cjson: bump to version v1.0.2
This is a major update in cjson:
- project site moved from sourceforge to github
- project recommends to use the new cmake buildsystem instead of the
legacy make
- BR2_STATIC_LIBS is now OK (README does not mention issue anymore)
- As include path and library name have changed, tinycbor has to be
updated
- As cjson can now be built as a static library, fix a bug in
json2cbor compilation from tinycbor package
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/cjson')
| -rw-r--r-- | package/cjson/Config.in | 4 | ||||
| -rw-r--r-- | package/cjson/cjson.hash | 2 | ||||
| -rw-r--r-- | package/cjson/cjson.mk | 22 |
3 files changed, 6 insertions, 22 deletions
diff --git a/package/cjson/Config.in b/package/cjson/Config.in index bbe4c4a968..04eff4ca88 100644 --- a/package/cjson/Config.in +++ b/package/cjson/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_CJSON bool "cJSON" - # For static build with cJSON.c directly see README - depends on !BR2_STATIC_LIBS help An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C compliant JSON parser, under MIT license. - http://cjson.sourceforge.net/ + https://github.com/DaveGamble/cJSON diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash new file mode 100644 index 0000000000..27f1d46983 --- /dev/null +++ b/package/cjson/cjson.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 5c3a4a77796b230efbd74369b0974d14ac0408f2677bd116d4a4b5894b9be372 cjson-v1.0.2.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 8f21ef8a10..c544a772c3 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,26 +4,10 @@ # ################################################################################ -CJSON_VERSION = 58 -CJSON_SITE_METHOD = svn -CJSON_SITE = http://svn.code.sf.net/p/cjson/code +CJSON_VERSION = v1.0.2 +CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -define CJSON_BUILD_CMDS - cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \ - cJSON.c -o libcJSON.so -endef - -define CJSON_INSTALL_STAGING_CMDS - $(INSTALL) -D $(@D)/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h - $(INSTALL) -D $(@D)/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so -endef - -define CJSON_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h - $(INSTALL) -D $(@D)/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) |
