summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-19 19:31:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-12 08:51:09 +0100
commit7ee0540f5cf55441a4af40fdbb625b6dc20fe44f (patch)
treee4a022763d32e1d309d09a76f7c8874355a40caf
parent82b555aef24f7ca454a624f5dea2f222b3206663 (diff)
downloadpoky-7ee0540f5cf55441a4af40fdbb625b6dc20fe44f.tar.gz
json-c: Upgrade to 0.12.1 release
Backport fix for gcc7 warning along the way Remove --disable-rpath as this configure doesn't support it anymore [RB]. (From OE-Core rev: ccf630e78aad488da7b80f2981037d3d0559cfad) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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/0001-Link-against-libm-when-needed.patch53
-rw-r--r--meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch37
-rw-r--r--meta/recipes-devtools/json-c/json-c_0.12.1.bb (renamed from meta/recipes-devtools/json-c/json-c_0.12.bb)18
4 files changed, 83 insertions, 99 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
new file mode 100644
index 0000000000..537be5e6d2
--- /dev/null
+++ b/meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch
@@ -0,0 +1,74 @@
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/0001-Link-against-libm-when-needed.patch b/meta/recipes-devtools/json-c/json-c/0001-Link-against-libm-when-needed.patch
deleted file mode 100644
index bfe9d72313..0000000000
--- a/meta/recipes-devtools/json-c/json-c/0001-Link-against-libm-when-needed.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 93582ad85ef48c18ac12f00a9a9e124989b1fcab Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Fri, 1 May 2015 12:52:18 +0200
4Subject: [PATCH] Link against libm when needed
5
6In certain C libraries (e.g uClibc), isnan() and related functions are
7implemented in libm, so json-c needs to link against it. This commit
8therefore adds an AC_TRY_LINK() test to check whether a program
9calling isnan() can be properly linked with no special flags. If not,
10we assume linking against libm is needed.
11
12The json-c.pc.in file is also adjusted so that in the case of static
13linking against json-c, -lm is also used.
14
15Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
16---
17Upstream-Status: Backport
18
19 configure.ac | 4 ++++
20 json-c.pc.in | 3 ++-
21 2 files changed, 6 insertions(+), 1 deletion(-)
22
23diff --git a/configure.ac b/configure.ac
24index c50f81b..30e7174 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -50,6 +50,10 @@ AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]])
28 AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]])
29 AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]])
30
31+if test "$ac_cv_have_decl_isnan" = "yes" ; then
32+ AC_TRY_LINK([#include <math.h>], [float f = 0.0; return isnan(f)], [], [LIBS="$LIBS -lm"])
33+fi
34+
35 #check if .section.gnu.warning accepts long strings (for __warn_references)
36 AC_LANG_PUSH([C])
37
38diff --git a/json-c.pc.in b/json-c.pc.in
39index 037739d..05bfbc8 100644
40--- a/json-c.pc.in
41+++ b/json-c.pc.in
42@@ -6,6 +6,7 @@ includedir=@includedir@
43 Name: json-c
44 Description: JSON implementation in C
45 Version: @VERSION@
46-Requires:
47+Requires:
48+Libs.private: @LIBS@
49 Libs: -L${libdir} -ljson-c
50 Cflags: -I${includedir}/json-c
51--
522.8.1
53
diff --git a/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch b/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
deleted file mode 100644
index d29d9118dc..0000000000
--- a/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 9be71700eb580c815688584a64621a38867c3fdd Mon Sep 17 00:00:00 2001
2From: James Myatt <james.myatt@tessella.com>
3Date: Thu, 5 Feb 2015 15:57:14 +0000
4Subject: [PATCH] json_tokener requires INF and NAN
5
6---
7Upstream-Status: Backport
8
9 json_tokener.c | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12Index: json-c-0.12/json_tokener.c
13===================================================================
14--- json-c-0.12.orig/json_tokener.c
15+++ json-c-0.12/json_tokener.c
16@@ -16,6 +16,7 @@
17 #include "config.h"
18
19 #include <math.h>
20+#include "math_compat.h"
21 #include <stdio.h>
22 #include <stdlib.h>
23 #include <stddef.h>
24@@ -352,12 +353,10 @@ struct json_object* json_tokener_parse_e
25
26 case json_tokener_state_inf: /* aka starts with 'i' */
27 {
28- int size;
29- int size_inf;
30+ size_t size_inf;
31 int is_negative = 0;
32
33 printbuf_memappend_fast(tok->pb, &c, 1);
34- size = json_min(tok->st_pos+1, json_null_str_len);
35 size_inf = json_min(tok->st_pos+1, json_inf_str_len);
36 char *infbuf = tok->pb->buf;
37 if (*infbuf == '-')
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/meta/recipes-devtools/json-c/json-c_0.12.1.bb
index a15455c9bf..401cf13205 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.12.1.bb
@@ -5,25 +5,25 @@ 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-json_tokener-requires-INF-and-NAN.patch \ 8 file://0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch \
9 file://0001-Link-against-libm-when-needed.patch \ 9 "
10 " 10SRC_URI[md5sum] = "55f7853f7d8cf664554ce3fa71bf1c7d"
11 11SRC_URI[sha256sum] = "2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123"
12SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
13SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
14 12
15UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar" 13UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
16# json-c releases page is fetching the list of releases in some weird XML format 14# json-c releases page is fetching the list of releases in some weird XML format
17# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/ 15# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
18#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html" 16#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
19RECIPE_UPSTREAM_VERSION = "0.12" 17RECIPE_UPSTREAM_VERSION = "0.12.1"
20RECIPE_UPSTREAM_DATE = "Apr 11, 2014" 18RECIPE_UPSTREAM_DATE = "Jun 07, 2016"
21CHECK_DATE = "Dec 04, 2015" 19CHECK_DATE = "Apr 19, 2017"
22 20
23RPROVIDES_${PN} = "libjson" 21RPROVIDES_${PN} = "libjson"
24 22
25inherit autotools 23inherit autotools
26 24
25EXTRA_OECONF = "--enable-rdrand"
26
27do_configure_prepend() { 27do_configure_prepend() {
28 # Clean up autoconf cruft that should not be in the tarball 28 # Clean up autoconf cruft that should not be in the tarball
29 rm -f ${S}/config.status 29 rm -f ${S}/config.status