From patchwork Sat Nov 19 15:25:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 696853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tLdxF0X7tz9syB for ; Sun, 20 Nov 2016 02:26:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NNMxed5U"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D6B08B928; Sat, 19 Nov 2016 15:26:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5unNPnw2Gijc; Sat, 19 Nov 2016 15:26:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 806758B909; Sat, 19 Nov 2016 15:26:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E16DE1C0193 for ; Sat, 19 Nov 2016 15:26:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D6E5F8A514 for ; Sat, 19 Nov 2016 15:26:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aTXciTIa+CTP for ; Sat, 19 Nov 2016 15:26:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 05B9D8A512 for ; Sat, 19 Nov 2016 15:26:03 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id a20so13811322wme.2 for ; Sat, 19 Nov 2016 07:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=daUfeBKUSF2pQs3TCSAuzmH5374yG16D9G4xOLymwhs=; b=NNMxed5Ufmdzgm2PL0af2l/a5C9+eQ8SWd/8S+oKItdoxDn1XSJ6OuOEb59fGh/ms/ c3nD/0tGYo+YRmB6XsmdeIB2tTlrWMcDrDKhRAqQs7ubIVopH40Uq3hDtQuc4+t052Bq gL1lb3nRyXYWrUf1i2GBg/JGPxaO70ZDd5nhTfDk8JvJcqsRBl6/gValxQoKvVBPfJ9I ByotRGfMFv9Z5EVhKWNh3k0dUo72m9gOo1KYz8wavM7wKZRk8SPqsxq/SndWgbekIfhK 7jzshgghwj10YUQ3ThLVq0K8DdeARufeQ1GjxmPWB360pb5fxNEGLYVPTaEgw9p8HoOI 2/2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=daUfeBKUSF2pQs3TCSAuzmH5374yG16D9G4xOLymwhs=; b=F/UHNTVI+060GjAxup9rJtou+RnlYFtxJuoLq5oR3zMZEiaOWhyDPIy05n6tlOnuDB HxjCH1hAgRTcg56JX+jNyDekQo2TPAr+1JlV4h8fvEMcmJTXOagU2CrKe4NsdOT0QoIf kCSrnRowmv0DnGlvuAHOUYVhlDLFhfnXIlgX5OEMEbgxkQYH5iqWAIWGUXtGkUyRlPLK w2q1SEHjrRoOHXn9z9pyLCTdy54FQ5Mbuoocwo2CQA7jSHaKRlhKKG0dbtxTtcOZdGzH cB8pVW9/9BlDrNzxWMGkzviBHI3cTSG6E0adP7K2KKyFHu/Q/bijmILOiD3uUDOWKi6q 2Mig== X-Gm-Message-State: AKaTC01qCc591/p2cbPiPIyJg7CGBNqeOjEoFafyxL3z2KSGtlfccAyCkqnmHjKPH+lazw== X-Received: by 10.28.148.6 with SMTP id w6mr4257336wmd.43.1479569161311; Sat, 19 Nov 2016 07:26:01 -0800 (PST) Received: from localhost.localdomain (ARennes-656-1-336-134.w2-12.abo.wanadoo.fr. [2.12.164.134]) by smtp.gmail.com with ESMTPSA id 138sm9232849wms.20.2016.11.19.07.25.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Nov 2016 07:26:00 -0800 (PST) From: Fabrice Fontaine X-Google-Original-From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 19 Nov 2016 16:25:48 +0100 Message-Id: <1479569149-123944-1-git-send-email-fabrice.fontaine@orange.com> X-Mailer: git-send-email 2.5.0 Cc: Fabrice Fontaine Subject: [Buildroot] [PATCH 1/2] cjson: bump to version v1.0.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Fabrice Fontaine --- package/cjson/Config.in | 4 +--- package/cjson/cjson.hash | 2 ++ package/cjson/cjson.mk | 22 +++------------------- 3 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 package/cjson/cjson.hash diff --git a/package/cjson/Config.in b/package/cjson/Config.in index bbe4c4a..04eff4c 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 0000000..1fd6805 --- /dev/null +++ b/package/cjson/cjson.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 e49954e3b50f2257ab0c890b6151e794790ef7cce881426cb0e0e80037beabb4 cjson-v1.0.0.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 8f21ef8..46cf6a2 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.0 +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))