summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Royds via Openembedded-core <openembedded-core@lists.openembedded.org>2019-06-11 18:01:42 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-11 13:26:55 +0100
commitef8080c804d160da5e7683f28c0c5924bc98bba4 (patch)
tree62e9a61ccde801de04dc44260a97a734a3fb4a31
parentfd1cfea5be9b643c8a58fc975c97c5b9f7e5263b (diff)
downloadpoky-ef8080c804d160da5e7683f28c0c5924bc98bba4.tar.gz
json-c: Backport --disable-werror patch to allow compilation under icecc
icecc preprocesses source files locally before shipping them off to be compiled on remote hosts. This preprocessing removes comments, including /* fallthough */ comments in switch statements that normally prevent an implicit-fallthrough warning, see https://github.com/icecc/icecream/issues/419 Rather than turning off -Werror, the upstream project has implemented a configure option, --disable-werror, in response to Ross's https://github.com/json-c/json-c/issues/489 This patch from https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8 Upstream-Status: Backport [Not yet released] (From OE-Core rev: c668b467415599cb95d93a231eb51d77137a57e4) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch45
-rw-r--r--meta/recipes-devtools/json-c/json-c_0.13.1.bb8
2 files changed, 51 insertions, 2 deletions
diff --git a/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch b/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
new file mode 100644
index 0000000000..0c20c8458a
--- /dev/null
+++ b/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
@@ -0,0 +1,45 @@
1json-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
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
index 5b10e68297..9d8f2e7870 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
@@ -4,7 +4,9 @@ HOMEPAGE = "https://github.com/json-c/json-c/wiki"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" 5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
6 6
7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz" 7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
8 file://add-disable-werror-option-to-configure.patch \
9 "
8SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350" 10SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
9SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873" 11SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"
10 12
@@ -20,7 +22,9 @@ RPROVIDES_${PN} = "libjson"
20 22
21inherit autotools 23inherit autotools
22 24
23EXTRA_OECONF = "--enable-rdrand" 25EXTRA_OECONF = "--disable-werror \
26 --enable-rdrand \
27 "
24 28
25do_configure_prepend() { 29do_configure_prepend() {
26 # Clean up autoconf cruft that should not be in the tarball 30 # Clean up autoconf cruft that should not be in the tarball