[OE-core] [PATCH 3/6] json-c: Include math_compat.c for NAN/INF values

[Khem Raj]

> On Aug 22, 2015, at 8:58 AM, Khem Raj <raj.khem at gmail.com> wrote:
> 
> The backport patch also fixes the warning which was being work arounded
> by disabling unused-but-set-variable
> 

Just saw it fail with gcc 5.2 in local builder, sent a v2 with the fix.

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
> .../0001-json_tokener-requires-INF-and-NAN.patch   | 32 ++++++++++++++++++++++
> meta/recipes-devtools/json-c/json-c_0.12.bb        |  6 ++--
> 2 files changed, 35 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
> 
> 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
> new file mode 100644
> index 0000000..58ccf7b
> --- /dev/null
> +++ b/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
> @@ -0,0 +1,32 @@
> +From 9be71700eb580c815688584a64621a38867c3fdd Mon Sep 17 00:00:00 2001
> +From: James Myatt <james.myatt at tessella.com>
> +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 <math.h>
> ++#include "math_compat.h"
> + #include <stdio.h>
> + #include <stdlib.h>
> + #include <stddef.h>
> +@@ -353,7 +354,7 @@ 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);
> diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb
> index e9c5b31..cfef03d 100644
> --- a/meta/recipes-devtools/json-c/json-c_0.12.bb
> +++ b/meta/recipes-devtools/json-c/json-c_0.12.bb
> @@ -4,7 +4,9 @@ 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"
> +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
> +           file://0001-json_tokener-requires-INF-and-NAN.patch \
> +          "
> 
> SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
> SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
> @@ -17,5 +19,3 @@ do_configure_prepend() {
>     # Clean up autoconf cruft that should not be in the tarball
>     rm -f ${S}/config.status
> }
> -
> -CFLAGS += "-Wno-error=unused-but-set-variable"
> --
> 2.1.4
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150824/371a317c/attachment-0002.sig>