Skip to contentSkip to conversation

json-c: fix build without threads support

PATCH New Baruch Siach 2 participants 2 messages Dec 30, 2017 – Dec 31, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 json-c: fix build without threads support

An uClibc toolchain that does not support threads emits a warning when _REENTRANT is defined. This breaks build with -Werror. Remove -Werror as a workaround to fix the build.

This issue as been reported upstream
(https://github.com/json-c/json-c/issues/396).

Fixes:
http://autobuild.buildroot.net/results/606/60683141f2ef320a28820c4cd65d2b951123b147/
http://autobuild.buildroot.net/results/969/969faba96d94c1bda7e06b005d8f3a3f7175a0a2/

---
 .../json-c/0001-configure.ac-remove-Werror.patch   | 32 ++++++++++++++++++++++
 package/json-c/json-c.mk                           |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 package/json-c/0001-configure.ac-remove-Werror.patch
package/json-c/0001-configure.ac-remove-Werror.patch new file +32 -0
new file mode 100644
index 000000000000..e877671519d2
@@ -0,0 +1,32 @@
+From 79d862ccaabc6620ce4b2783a44d6014ae837df9 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <[email protected]>
+Date: Sun, 31 Dec 2017 00:01:37 +0200
+Subject: [PATCH] configure.ac: remove -Werror
+
+The unconditional _REENTRANT macro causes a warning when building with a
+no-threads toolchain. Remove -Werror to fix the build.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: not upstreamable
+Issue reported upstream: https://github.com/json-c/json-c/issues/396
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 024c5aa0d687..74caa4d99e15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,7 +165,7 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
+ AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
+ AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
+ 
+-AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
++AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
+ AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
+ AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE -D_REENTRANT])
+ 
+-- 
+2.15.1
+
package/json-c/json-c.mk +4 -0
index d8007b869133..046529560861 100644
@@ -10,5 +10,9 @@ JSON_C_INSTALL_STAGING = YES
 JSON_C_LICENSE = MIT
 JSON_C_LICENSE_FILES = COPYING
 
+# Patching configure.ac
+JSON_C_AUTORECONF = YES
+HOST_JSON_C_AUTORECONF = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.15.1
#1 lore raw

PATCH 1/1 json-c: fix build without threads support

Hello,

package/json-c/json-c.mk JSON_C_INSTALL_STAGING = YES · line 15

Quoted 3 lines · Baruch Siach
package/json-c/json-c.mk +3 -0
+# Patching configure.ac
+JSON_C_AUTORECONF = YES
+HOST_JSON_C_AUTORECONF = YES

I've dropped this last line, because it is implied by JSON_C_AUTORECONF = YES, and then I've applied. Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com