summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanomi Manchego <danomimanchego123@gmail.com>2013-01-30 17:26:37 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-01 07:57:53 (GMT)
commit7bb7c0843449d605ad93d93dad6c12d275cae31b (patch)
tree0ee8e3b1b202fe405f19dbc5ac9f7420320fba0a
parent604f35dd5f42c71adc23d787e66767fe74486e3d (diff)
downloadbuildroot-7bb7c0843449d605ad93d93dad6c12d275cae31b.tar.gz
buildroot-7bb7c0843449d605ad93d93dad6c12d275cae31b.tar.bz2
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: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/cjson/cjson.mk22
1 files changed, 9 insertions, 13 deletions
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 55af800..3722adb 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -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))