Message ID | 1359602797-4498-1-git-send-email-danomimanchego123@gmail.com |
---|---|
State | Accepted |
Commit | 7bb7c0843449d605ad93d93dad6c12d275cae31b |
Headers | show |
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> 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?
On Thu, Jan 31, 2013 at 8:14 AM, Peter Korsgaard <jacmet@uclibc.org> wrote: > Looks good, but you forgot your signed-off-by. Can I add it, please? Doh! Sorry about that. Yes, please add my Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> writes: Danomi> On Thu, Jan 31, 2013 at 8:14 AM, Peter Korsgaard <jacmet@uclibc.org> wrote: >> 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 <danomimanchego123@gmail.com> Committed, thanks.
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))