summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-02-02 10:16:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:28 +0000
commit4cce58051bfda9e9c4d15ad70f15f4f1ee12fc4e (patch)
tree51db3605867aee6f53ede96717f1194cdb83fd4d /meta
parenta1027acfd7ea9f0ea9cd751801ac05f01fcd199c (diff)
downloadpoky-4cce58051bfda9e9c4d15ad70f15f4f1ee12fc4e.tar.gz
json-c: update to 0.13
Drop 0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch since it had been merged upstream. (From OE-Core rev: 77b46f844c50e3da90f91669baf6ba936ab7af9f) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch74
-rw-r--r--meta/recipes-devtools/json-c/json-c_0.13.bb (renamed from meta/recipes-devtools/json-c/json-c_0.12.1.bb)11
2 files changed, 5 insertions, 80 deletions
diff --git a/meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch b/meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch
deleted file mode 100644
index 537be5e6d2..0000000000
--- a/meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 7b24f8bd95ad4f7d00c93ca2ad998c14a0266dbe Mon Sep 17 00:00:00 2001
2From: marxin <mliska@suse.cz>
3Date: Tue, 21 Mar 2017 08:42:11 +0100
4Subject: [PATCH] Add FALLTHRU comment to handle GCC7 warnings.
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 json_object.c | 1 +
11 json_tokener.c | 1 +
12 linkhash.c | 22 +++++++++++-----------
13 3 files changed, 13 insertions(+), 11 deletions(-)
14
15diff --git a/json_object.c b/json_object.c
16index 6cc73bc..77e8b21 100644
17--- a/json_object.c
18+++ b/json_object.c
19@@ -552,6 +552,7 @@ int64_t json_object_get_int64(struct json_object *jso)
20 return jso->o.c_boolean;
21 case json_type_string:
22 if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
23+ /* FALLTHRU */
24 default:
25 return 0;
26 }
27diff --git a/json_tokener.c b/json_tokener.c
28index 9a76293..ae7b1ae 100644
29--- a/json_tokener.c
30+++ b/json_tokener.c
31@@ -305,6 +305,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
32 tok->err = json_tokener_error_parse_unexpected;
33 goto out;
34 }
35+ /* FALLTHRU */
36 case '"':
37 state = json_tokener_state_string;
38 printbuf_reset(tok->pb);
39diff --git a/linkhash.c b/linkhash.c
40index 712c387..74e3b0f 100644
41--- a/linkhash.c
42+++ b/linkhash.c
43@@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
44 /*-------------------------------- last block: affect all 32 bits of (c) */
45 switch(length) /* all the case statements fall through */
46 {
47- case 12: c+=((uint32_t)k[11])<<24;
48- case 11: c+=((uint32_t)k[10])<<16;
49- case 10: c+=((uint32_t)k[9])<<8;
50- case 9 : c+=k[8];
51- case 8 : b+=((uint32_t)k[7])<<24;
52- case 7 : b+=((uint32_t)k[6])<<16;
53- case 6 : b+=((uint32_t)k[5])<<8;
54- case 5 : b+=k[4];
55- case 4 : a+=((uint32_t)k[3])<<24;
56- case 3 : a+=((uint32_t)k[2])<<16;
57- case 2 : a+=((uint32_t)k[1])<<8;
58+ case 12: c+=((uint32_t)k[11])<<24; /* FALLTHRU */
59+ case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */
60+ case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */
61+ case 9 : c+=k[8]; /* FALLTHRU */
62+ case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */
63+ case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */
64+ case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */
65+ case 5 : b+=k[4]; /* FALLTHRU */
66+ case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */
67+ case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */
68+ case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */
69 case 1 : a+=k[0];
70 break;
71 case 0 : return c;
72--
732.12.2
74
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.1.bb b/meta/recipes-devtools/json-c/json-c_0.13.bb
index 401cf13205..06319de323 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.bb
@@ -5,18 +5,17 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" 5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
6 6
7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ 7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
8 file://0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch \
9 " 8 "
10SRC_URI[md5sum] = "55f7853f7d8cf664554ce3fa71bf1c7d" 9SRC_URI[md5sum] = "11fc5d90c77375e5fc8401e8b9efbf21"
11SRC_URI[sha256sum] = "2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123" 10SRC_URI[sha256sum] = "0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d"
12 11
13UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar" 12UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
14# json-c releases page is fetching the list of releases in some weird XML format 13# json-c releases page is fetching the list of releases in some weird XML format
15# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/ 14# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
16#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html" 15#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
17RECIPE_UPSTREAM_VERSION = "0.12.1" 16RECIPE_UPSTREAM_VERSION = "0.13"
18RECIPE_UPSTREAM_DATE = "Jun 07, 2016" 17RECIPE_UPSTREAM_DATE = "Dec 07, 2017"
19CHECK_DATE = "Apr 19, 2017" 18CHECK_DATE = "Jan 31, 2018"
20 19
21RPROVIDES_${PN} = "libjson" 20RPROVIDES_${PN} = "libjson"
22 21