Skip to contentSkip to conversation

package/turbolua: Fix build with gcc7

PATCH New Marcin Niestroj 2 participants 2 messages Sep 26, 2017 – Oct 3, 2017

lore
Share & tools
lore

Marcin Niestroj

author
#0 lore raw

PATCH v2 1/1 package/turbolua: Fix build with gcc7

gcc7 has -Wimplicit-fallthrough enabled by default. Together with -Werror in turbolua makefile it gives -Werror=implicit-fallthrough= build error.

Add upstreamable patch [1], which fixes typo in FALLTHROUGH comment, so it makes the fallthrough explicit for gcc.

[1] https://github.com/kernelsauce/turbo/pull/323

Fixes:
http://autobuild.buildroot.net/results/6f107b62f105508044185576b071323e5d73dd83
http://autobuild.buildroot.net/results/d303929960c667a21181d0bbdab64ba8a8d56a4f

Signed-off-by Marcin Niestroj <[email protected]>

---
Changes v1 -> v2 (suggested by Baruch):
* Added Signed-off-by in patch
* Added link to upstream pull request in patch

 ...er-Fix-typo-in-switch-FALLTHROUGH-comment.patch | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/turbolua/0001-http-parser-Fix-typo-in-switch-FALLTHROUGH-comment.patch
package/turbolua/0001-http-parser-Fix-typo-in-switch-FALLTHROUGH-comment.patch new file +31 -0
new file mode 100644
index 0000000000..bb27056ac6
@@ -0,0 +1,31 @@
+From 570db52d7fd3b4deffe785e60fb362e1496844ee Mon Sep 17 00:00:00 2001
+From: Marcin Niestroj <[email protected]>
+Date: Tue, 26 Sep 2017 12:10:53 +0200
+Subject: [PATCH] http-parser: Fix typo in switch FALLTHROUGH comment
+
+This also suppresses -Wimplicit-fallthrough warning, which is enabled
+in gcc7 by default.
+
+PR for upstream: https://github.com/kernelsauce/turbo/pull/323
+
+Signed-off-by: Marcin Niestroj <[email protected]>
+---
+ deps/http-parser/http_parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/http-parser/http_parser.c b/deps/http-parser/http_parser.c
+index 8cf6fb0..2ff1073 100644
+--- a/deps/http-parser/http_parser.c
++++ b/deps/http-parser/http_parser.c
+@@ -2095,7 +2095,7 @@ http_parser_parse_url(
+       case s_req_server_with_at:
+         found_at = 1;
+ 
+-      /* FALLTROUGH */
++      /* FALLTHROUGH */
+       case s_req_server:
+         uf = UF_HOST;
+         break;
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH v2 1/1 package/turbolua: Fix build with gcc7

Hello,

Quoted 13 lines · Marcin Niestroj

gcc7 has -Wimplicit-fallthrough enabled by default. Together with -Werror in turbolua makefile it gives -Werror=implicit-fallthrough= build error.

Add upstreamable patch [1], which fixes typo in FALLTHROUGH comment, so it makes the fallthrough explicit for gcc.

[1] https://github.com/kernelsauce/turbo/pull/323

Fixes:
http://autobuild.buildroot.net/results/6f107b62f105508044185576b071323e5d73dd83
http://autobuild.buildroot.net/results/d303929960c667a21181d0bbdab64ba8a8d56a4f

Quoted 5 lines
Signed-off-by Marcin Niestroj <[email protected]>

---
Changes v1 -> v2 (suggested by Baruch):
* Added Signed-off-by in patch
* Added link to upstream pull request in patch

Applied to master, thanks.

Thomas

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