diff options
Diffstat (limited to 'meta/recipes-devtools/json-c')
3 files changed, 103 insertions, 2 deletions
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 new file mode 100644 index 0000000000..bfe9d72313 --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c/0001-Link-against-libm-when-needed.patch @@ -0,0 +1,53 @@ +From 93582ad85ef48c18ac12f00a9a9e124989b1fcab Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +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 <thomas.petazzoni@free-electrons.com> +--- +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 <math.h>]]) + AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]]) + AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]]) + ++if test "$ac_cv_have_decl_isnan" = "yes" ; then ++ AC_TRY_LINK([#include <math.h>], [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 new file mode 100644 index 0000000000..d29d9118dc --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch @@ -0,0 +1,37 @@ +From 9be71700eb580c815688584a64621a38867c3fdd Mon Sep 17 00:00:00 2001 +From: James Myatt <james.myatt@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> +@@ -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.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb index e9c5b31745..a15455c9bf 100644 --- a/meta/recipes-devtools/json-c/json-c_0.12.bb +++ b/meta/recipes-devtools/json-c/json-c_0.12.bb @@ -4,11 +4,22 @@ 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 \ + file://0001-Link-against-libm-when-needed.patch \ + " SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491" SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f" +UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\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 @@ -18,4 +29,4 @@ do_configure_prepend() { rm -f ${S}/config.status } -CFLAGS += "-Wno-error=unused-but-set-variable" +BBCLASSEXTEND = "native nativesdk" |