Skip to contentSkip to conversation

cjson: change source to svn repo

PATCH New Danomi Manchego 2 participants 4 messages Jan 31, 2013 – Feb 1, 2013

lore
Share & tools
lore

Danomi Manchego

author
#0 lore raw

PATCH 1/1 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.

---
 package/cjson/cjson.mk |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
package/cjson/cjson.mk +9 -13
index 55af800..3722adb 100644
@@ -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))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 cjson: change source to svn repo

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Danomi" == Danomi Manchego <[email protected]> writes:

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

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

Looks good, but you forgot your signed-off-by. Can I add it, please?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 cjson: change source to svn repo

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Danomi" == Danomi Manchego <[email protected]> writes:

Quoted 1 line · Peter Korsgaard
Quoted 1 line

Looks good, but you forgot your signed-off-by. Can I add it, please?

Danomi> Doh! Sorry about that. Yes, please add my Danomi> Signed-off-by: Danomi Manchego <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard