From 7ee0540f5cf55441a4af40fdbb625b6dc20fe44f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 Apr 2017 19:31:44 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...-FALLTHRU-comment-to-handle-GCC7-warnings.patch | 74 ++++++++++++++++++++++ .../0001-Link-against-libm-when-needed.patch | 53 ---------------- .../0001-json_tokener-requires-INF-and-NAN.patch | 37 ----------- meta/recipes-devtools/json-c/json-c_0.12.1.bb | 32 ++++++++++ meta/recipes-devtools/json-c/json-c_0.12.bb | 32 ---------- 5 files changed, 106 insertions(+), 122 deletions(-) create mode 100644 meta/recipes-devtools/json-c/json-c/0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch delete mode 100644 meta/recipes-devtools/json-c/json-c/0001-Link-against-libm-when-needed.patch delete mode 100644 meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch create mode 100644 meta/recipes-devtools/json-c/json-c_0.12.1.bb delete mode 100644 meta/recipes-devtools/json-c/json-c_0.12.bb (limited to 'meta/recipes-devtools/json-c') 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 @@ +From 7b24f8bd95ad4f7d00c93ca2ad998c14a0266dbe Mon Sep 17 00:00:00 2001 +From: marxin +Date: Tue, 21 Mar 2017 08:42:11 +0100 +Subject: [PATCH] Add FALLTHRU comment to handle GCC7 warnings. + +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + json_object.c | 1 + + json_tokener.c | 1 + + linkhash.c | 22 +++++++++++----------- + 3 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/json_object.c b/json_object.c +index 6cc73bc..77e8b21 100644 +--- a/json_object.c ++++ b/json_object.c +@@ -552,6 +552,7 @@ int64_t json_object_get_int64(struct json_object *jso) + return jso->o.c_boolean; + case json_type_string: + if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint; ++ /* FALLTHRU */ + default: + return 0; + } +diff --git a/json_tokener.c b/json_tokener.c +index 9a76293..ae7b1ae 100644 +--- a/json_tokener.c ++++ b/json_tokener.c +@@ -305,6 +305,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, + tok->err = json_tokener_error_parse_unexpected; + goto out; + } ++ /* FALLTHRU */ + case '"': + state = json_tokener_state_string; + printbuf_reset(tok->pb); +diff --git a/linkhash.c b/linkhash.c +index 712c387..74e3b0f 100644 +--- a/linkhash.c ++++ b/linkhash.c +@@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval) + /*-------------------------------- last block: affect all 32 bits of (c) */ + switch(length) /* all the case statements fall through */ + { +- case 12: c+=((uint32_t)k[11])<<24; +- case 11: c+=((uint32_t)k[10])<<16; +- case 10: c+=((uint32_t)k[9])<<8; +- case 9 : c+=k[8]; +- case 8 : b+=((uint32_t)k[7])<<24; +- case 7 : b+=((uint32_t)k[6])<<16; +- case 6 : b+=((uint32_t)k[5])<<8; +- case 5 : b+=k[4]; +- case 4 : a+=((uint32_t)k[3])<<24; +- case 3 : a+=((uint32_t)k[2])<<16; +- case 2 : a+=((uint32_t)k[1])<<8; ++ case 12: c+=((uint32_t)k[11])<<24; /* FALLTHRU */ ++ case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */ ++ case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */ ++ case 9 : c+=k[8]; /* FALLTHRU */ ++ case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */ ++ case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */ ++ case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */ ++ case 5 : b+=k[4]; /* FALLTHRU */ ++ case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */ ++ case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */ ++ case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */ + case 1 : a+=k[0]; + break; + case 0 : return c; +-- +2.12.2 + 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 @@ -From 93582ad85ef48c18ac12f00a9a9e124989b1fcab Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 1 May 2015 12:52:18 +0200 -Subject: [PATCH] Link against libm when needed - -In certain C libraries (e.g uClibc), isnan() and related functions are -implemented in libm, so json-c needs to link against it. This commit -therefore adds an AC_TRY_LINK() test to check whether a program -calling isnan() can be properly linked with no special flags. If not, -we assume linking against libm is needed. - -The json-c.pc.in file is also adjusted so that in the case of static -linking against json-c, -lm is also used. - -Signed-off-by: Thomas Petazzoni ---- -Upstream-Status: Backport - - configure.ac | 4 ++++ - json-c.pc.in | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c50f81b..30e7174 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,10 @@ AC_CHECK_DECLS([isinf], [], [], [[#include ]]) - AC_CHECK_DECLS([_isnan], [], [], [[#include ]]) - AC_CHECK_DECLS([_finite], [], [], [[#include ]]) - -+if test "$ac_cv_have_decl_isnan" = "yes" ; then -+ AC_TRY_LINK([#include ], [float f = 0.0; return isnan(f)], [], [LIBS="$LIBS -lm"]) -+fi -+ - #check if .section.gnu.warning accepts long strings (for __warn_references) - AC_LANG_PUSH([C]) - -diff --git a/json-c.pc.in b/json-c.pc.in -index 037739d..05bfbc8 100644 ---- a/json-c.pc.in -+++ b/json-c.pc.in -@@ -6,6 +6,7 @@ includedir=@includedir@ - Name: json-c - Description: JSON implementation in C - Version: @VERSION@ --Requires: -+Requires: -+Libs.private: @LIBS@ - Libs: -L${libdir} -ljson-c - Cflags: -I${includedir}/json-c --- -2.8.1 - 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 @@ -From 9be71700eb580c815688584a64621a38867c3fdd Mon Sep 17 00:00:00 2001 -From: James Myatt -Date: Thu, 5 Feb 2015 15:57:14 +0000 -Subject: [PATCH] json_tokener requires INF and NAN - ---- -Upstream-Status: Backport - - json_tokener.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: json-c-0.12/json_tokener.c -=================================================================== ---- json-c-0.12.orig/json_tokener.c -+++ json-c-0.12/json_tokener.c -@@ -16,6 +16,7 @@ - #include "config.h" - - #include -+#include "math_compat.h" - #include - #include - #include -@@ -352,12 +353,10 @@ struct json_object* json_tokener_parse_e - - case json_tokener_state_inf: /* aka starts with 'i' */ - { -- int size; -- int size_inf; -+ size_t size_inf; - int is_negative = 0; - - printbuf_memappend_fast(tok->pb, &c, 1); -- size = json_min(tok->st_pos+1, json_null_str_len); - size_inf = json_min(tok->st_pos+1, json_inf_str_len); - char *infbuf = tok->pb->buf; - if (*infbuf == '-') diff --git a/meta/recipes-devtools/json-c/json-c_0.12.1.bb b/meta/recipes-devtools/json-c/json-c_0.12.1.bb new file mode 100644 index 0000000000..401cf13205 --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c_0.12.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "C bindings for apps which will manipulate JSON data" +DESCRIPTION = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C." +HOMEPAGE = "https://github.com/json-c/json-c/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" + +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ + file://0001-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch \ + " +SRC_URI[md5sum] = "55f7853f7d8cf664554ce3fa71bf1c7d" +SRC_URI[sha256sum] = "2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123" + +UPSTREAM_CHECK_REGEX = "json-c-(?P\d+(\.\d+)+).tar" +# json-c releases page is fetching the list of releases in some weird XML format +# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/ +#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html" +RECIPE_UPSTREAM_VERSION = "0.12.1" +RECIPE_UPSTREAM_DATE = "Jun 07, 2016" +CHECK_DATE = "Apr 19, 2017" + +RPROVIDES_${PN} = "libjson" + +inherit autotools + +EXTRA_OECONF = "--enable-rdrand" + +do_configure_prepend() { + # Clean up autoconf cruft that should not be in the tarball + rm -f ${S}/config.status +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb deleted file mode 100644 index a15455c9bf..0000000000 --- a/meta/recipes-devtools/json-c/json-c_0.12.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "C bindings for apps which will manipulate JSON data" -DESCRIPTION = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C." -HOMEPAGE = "https://github.com/json-c/json-c/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" - -SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ - file://0001-json_tokener-requires-INF-and-NAN.patch \ - file://0001-Link-against-libm-when-needed.patch \ - " - -SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491" -SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f" - -UPSTREAM_CHECK_REGEX = "json-c-(?P\d+(\.\d+)+).tar" -# json-c releases page is fetching the list of releases in some weird XML format -# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/ -#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html" -RECIPE_UPSTREAM_VERSION = "0.12" -RECIPE_UPSTREAM_DATE = "Apr 11, 2014" -CHECK_DATE = "Dec 04, 2015" - -RPROVIDES_${PN} = "libjson" - -inherit autotools - -do_configure_prepend() { - # Clean up autoconf cruft that should not be in the tarball - rm -f ${S}/config.status -} - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf