diff options
author | Baruch Siach <baruch@tkos.co.il> | 2017-12-23 21:29:43 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2017-12-26 19:57:44 +0100 |
commit | 131188de8df20028e2a7efaba3fdb13b6cca0aa2 (patch) | |
tree | 82cddd9dc7228e1d73f40307e46815d35cd55e21 /package/json-c/0002-Link-against-libm-when-needed.patch | |
parent | 19dd7f602579780810e538e55502d419dddd946b (diff) | |
download | buildroot-131188de8df20028e2a7efaba3fdb13b6cca0aa2.tar.gz buildroot-131188de8df20028e2a7efaba3fdb13b6cca0aa2.zip |
json-c: bump to version 0.13
Use upstream provided tarball; drop autoreconf.
Drop -Werror removal patch; json-c builds fine with gcc 7 without this
patch.
Drop upstream libm patch.
Drop --disable-oldname-compat; removed upstream.
Add license file hash.
Enable parallel build. The commit introducing MAKE1, ecd0f65af92
(json-c: bump to version 0.11) does not explain the reason for that. A
sequence of a few builds on a multi-core system never faild.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/json-c/0002-Link-against-libm-when-needed.patch')
-rw-r--r-- | package/json-c/0002-Link-against-libm-when-needed.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/package/json-c/0002-Link-against-libm-when-needed.patch b/package/json-c/0002-Link-against-libm-when-needed.patch deleted file mode 100644 index 305b782f76..0000000000 --- a/package/json-c/0002-Link-against-libm-when-needed.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ccb15ee3d7e8c925cb3af9ea805feea2863c4f81 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. - -Submitted upstream: https://github.com/json-c/json-c/pull/182 - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - configure.ac | 4 ++++ - json-c.pc.in | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99660a4..2a14ccf 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.1.0 - |