diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-01 13:09:39 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-01 13:11:30 +0200 |
| commit | 86b4491d44004b96636d1b8bf1ffa40ebe941af7 (patch) | |
| tree | 4fce0e9b685d8799cdd5af96d344b189915883d1 | |
| parent | c1f5aa84e800c3dc86e59a2b47d91bc309e70159 (diff) | |
| download | ptxdist-86b4491d44004b96636d1b8bf1ffa40ebe941af7.tar.gz ptxdist-86b4491d44004b96636d1b8bf1ffa40ebe941af7.tar.xz | |
Revert "json-c: fix building with gcc-7.x icecc"
This reverts commit bb0e6ca0a85f41942ceb6e99cb4202396c326999.
Implicit fallthrough errors are now avoided my the toolchain wrapper.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/json-c-0.13-20171207/0001-configure.ac-remove-Werror.patch | 32 | ||||
| l--------- | patches/json-c-0.13-20171207/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/json-c-0.13-20171207/series | 4 |
3 files changed, 0 insertions, 37 deletions
diff --git a/patches/json-c-0.13-20171207/0001-configure.ac-remove-Werror.patch b/patches/json-c-0.13-20171207/0001-configure.ac-remove-Werror.patch deleted file mode 100644 index 6effae982..000000000 --- a/patches/json-c-0.13-20171207/0001-configure.ac-remove-Werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 3 Mar 2018 21:13:12 +0100 -Subject: [PATCH] configure.ac: remove -Werror - -Building with -Werror fails for gcc-7.x and icecc. - -Icecc splits preprocessing and compiling. As a result comments are no -longer available at compile time and building fails with: - -json_object.c: In function 'json_object_get_int64': -json_object.c:698:6: error: this statement may fall through [-Werror=implicit-fallthrough=] -json_object.c:701:2: note: here -cc1: all warnings being treated as errors - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - 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]) - diff --git a/patches/json-c-0.13-20171207/autogen.sh b/patches/json-c-0.13-20171207/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/json-c-0.13-20171207/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/json-c-0.13-20171207/series b/patches/json-c-0.13-20171207/series deleted file mode 100644 index bdfd419ad..000000000 --- a/patches/json-c-0.13-20171207/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure.ac-remove-Werror.patch -# 229bc9ecec2d6d1a80c65f5369241d77 - git-ptx-patches magic |