diff options
author | Yann E. MORIN <yann.morin.1998@free.fr> | 2016-07-10 11:10:10 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-07-15 17:00:26 +0200 |
commit | a70bc14b92b423f68f94df91dc356bae5955c0af (patch) | |
tree | a121f043ad7022016c8946efdc844a4db28caf57 /package/libfastjson/0001-fix-missing-config.h.patch | |
parent | a2eed71c0d02d48367ad6bb362c040e881040800 (diff) | |
download | buildroot-a70bc14b92b423f68f94df91dc356bae5955c0af.tar.gz buildroot-a70bc14b92b423f68f94df91dc356bae5955c0af.zip |
package/libfastjson: fix build without threads
libfastjson is supposed to use the __sync_*4 atomic intrinsics, but alas
it is not using them because their ./configure decides they are not
available: it uses AC_TRY_RUN to check for them, and the default is to
decide they are not available, because of cross-compilation.
Besides, one of the source files was not including the generated
config.h, so even after fixing ./configure there was still a build
error.
The first patch is a backport from upstream to fix the missing
inclusion.
The second patch is switching AC_TRY_RUN over to AC_LINK_IFELSE, as the
only thing we're interested in is to check for the presence of the
atomic intrisics, and linking is enough for that.
Fixes:
http://autobuild.buildroot.org/results/192/1923d0b570adba494f83747a9610ea6ec35f5223/
http://autobuild.buildroot.org/results/23a/23ac0e742ed3a70ae4d038f8c9eadc23e708f671/
and many others...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libfastjson/0001-fix-missing-config.h.patch')
-rw-r--r-- | package/libfastjson/0001-fix-missing-config.h.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/libfastjson/0001-fix-missing-config.h.patch b/package/libfastjson/0001-fix-missing-config.h.patch new file mode 100644 index 0000000000..8663e23d66 --- /dev/null +++ b/package/libfastjson/0001-fix-missing-config.h.patch @@ -0,0 +1,29 @@ +From 3e017fe8da1e821d4fcd801c75467c8ec2a81eb4 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards <rgerhards@adiscon.com> +Date: Tue, 19 Apr 2016 08:21:50 +0200 +Subject: [PATCH] fix missing config.h + +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +--- + json_object_iterator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/json_object_iterator.c b/json_object_iterator.c +index 6ab3a85..fb51f6e 100644 +--- a/json_object_iterator.c ++++ b/json_object_iterator.c +@@ -17,8 +17,8 @@ + ******************************************************************************* + */ + ++#include "config.h" + #include <stddef.h> +- + #include "json.h" + #include "json_object_private.h" + #include "json_object_iterator.h" +-- +2.7.4 + |