Commit 7bb7c084 authored by Danomi Manchego's avatar Danomi Manchego Committed by Peter Korsgaard
Browse files

cjson: change source to svn repo 



The original cJSON submittal downloaded a .zip file from SourceForge.
The .zip file did not have a version number, making it impossible
to gaurantee that the same archive is downloaded on any given build.
It also required a custom EXTRACT command.

This patch changes the source for cJSON to the svn repository
listed on the sf project web page - giving us an actual version
number, and letting us use buildroot's normal extraction functionality.

Signed-off-by: default avatarDanomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 604f35dd

package/cjson/cjson.mk

+9 −13
Original line number Diff line number Diff line
@@ -3,28 +3,24 @@ 
# cjson

#

#############################################################

CJSON_VERSION         = undefined

CJSON_SOURCE          = cJSONFiles.zip

CJSON_SITE            = http://downloads.sourceforge.net/project/cjson

CJSON_VERSION         = 42

CJSON_SITE_METHOD     = svn

CJSON_SITE            = https://cjson.svn.sourceforge.net/svnroot/cjson

CJSON_INSTALL_STAGING = YES

CJSON_LICENSE         = MIT



define CJSON_EXTRACT_CMDS

	unzip -d $(@D) $(DL_DIR)/$(CJSON_SOURCE)

endef



define CJSON_BUILD_CMDS

	cd $(@D)/cJSON && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so

	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so

endef



define CJSON_INSTALL_STAGING_CMDS

	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h

	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so

	$(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/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h

	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so

	$(INSTALL) -D $(@D)/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h

	$(INSTALL) -D $(@D)/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so

endef



define CJSON_UNINSTALL_STAGING_CMDS
@@ -38,7 +34,7 @@ define CJSON_UNINSTALL_TARGET_CMDS 
endef



define CJSON_CLEAN_CMDS

	cd $(@D)/cJSON && rm -f libcJSON.so

	rm -f $(@D)/libcJSON.so

endef



$(eval $(generic-package))