blob: 0c20c8458a2d78abf422496d87f7cd50fd881053 [file] [log] [blame]
Brad Bishop15ae2502019-06-18 21:44:24 -04001json-c: Backport --disable-werror patch to allow compilation under icecc
2
3icecc preprocesses source files locally before shipping them off to be compiled
4on remote hosts. This preprocessing removes comments, including /* fallthough */
5comments in switch statements that normally prevent an implicit-fallthrough
6warning, see https://github.com/icecc/icecream/issues/419
7
8Rather than turning off -Werror, the upstream project has implemented a
9configure option, --disable-werror, in response to Ross's
10https://github.com/json-c/json-c/issues/489
11
12This patch from
13https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8
14
15Upstream-Status: Backport [Not yet released]
16Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
17
18From 21c886534f8927fdc0fb5f8647394f3e0e0874b8 Mon Sep 17 00:00:00 2001
19From: Pierce Lopez <pierce.lopez@gmail.com>
20Date: Sun, 9 Jun 2019 10:52:08 -0400
21Subject: [PATCH] build: add --disable-werror option to configure
22
23to omit -Werror compiler option
24---
25 configure.ac | 7 ++++++-
26 1 file changed, 6 insertions(+), 1 deletion(-)
27
28diff --git a/configure.ac b/configure.ac
29index 272ea6af9c..798fd5b747 100644
30--- a/configure.ac
31+++ b/configure.ac
32@@ -165,7 +165,12 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
33 AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
34 AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
35
36-AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
37+AC_ARG_ENABLE([werror],
38+ AS_HELP_STRING([--disable-werror], [avoid treating compiler warnings as fatal errors]))
39+
40+AS_IF([test "x$enable_werror" != "xno"], [AX_APPEND_COMPILE_FLAGS([-Werror])])
41+
42+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
43 AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
44 AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE])
45