[Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body

[Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body

[Fabrice Fontaine]

Fix the following build failure raised since bump to version 1.50.5 in
commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75:

../utils/viewer-cairo.c: In function 'cairo_vector_view_create':
../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
     ;
     ^

Fixes:
 - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch

diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch
new file mode 100644
index 0000000000..98b6828a63
--- /dev/null
+++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch
@@ -0,0 +1,47 @@
+From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 18 Mar 2022 18:55:56 +0100
+Subject: [PATCH] meson.build: drop -Werror=empty-body
+
+Drop -Werror=empty-body to avoid the following build failure raised
+since version 1.50.5 and
+https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e:
+
+../utils/viewer-cairo.c: In function 'cairo_vector_view_create':
+../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
+     ;
+     ^
+
+Fixes:
+ - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604]
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0f79bff7..c48fe01f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+     '-Wunused',
+     '-Werror=address',
+     '-Werror=array-bounds',
+-    '-Werror=empty-body',
+     '-Werror=implicit',
+     '-Werror=implicit-fallthrough',
+     '-Werror=init-self',
+@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+     '-Werror=write-strings',
+     '-Werror=address',
+     '-Werror=int-to-pointer-cast',
+-    '-Werror=empty-body',
+     '-Werror=write-strings',
+     '-Werror=unused-but-set-variable',
+     '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481
+-- 
+2.35.1
+
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body

[Arnout Vandecappelle]

On 18/03/2022 19:07, Fabrice Fontaine wrote:
> Fix the following build failure raised since bump to version 1.50.5 in
> commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75:
> 
> ../utils/viewer-cairo.c: In function 'cairo_vector_view_create':
> ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
>       ;
>       ^
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>   ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++
>   1 file changed, 47 insertions(+)
>   create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch
> 
> diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch
> new file mode 100644
> index 0000000000..98b6828a63
> --- /dev/null
> +++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch
> @@ -0,0 +1,47 @@
> +From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 18 Mar 2022 18:55:56 +0100
> +Subject: [PATCH] meson.build: drop -Werror=empty-body
> +
> +Drop -Werror=empty-body to avoid the following build failure raised
> +since version 1.50.5 and
> +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e:
> +
> +../utils/viewer-cairo.c: In function 'cairo_vector_view_create':
> +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
> +     ;
> +     ^
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status:
> +https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604]

  As noted in the MR: the patch is not upstreamable. Instead, the underlying 
error should be fixed. Which is trivial: simply replace the lone ';' with '{}'.

  Regards,
  Arnout

> +---
> + meson.build | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 0f79bff7..c48fe01f 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
> +     '-Wunused',
> +     '-Werror=address',
> +     '-Werror=array-bounds',
> +-    '-Werror=empty-body',
> +     '-Werror=implicit',
> +     '-Werror=implicit-fallthrough',
> +     '-Werror=init-self',
> +@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
> +     '-Werror=write-strings',
> +     '-Werror=address',
> +     '-Werror=int-to-pointer-cast',
> +-    '-Werror=empty-body',
> +     '-Werror=write-strings',
> +     '-Werror=unused-but-set-variable',
> +     '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481
> +--
> +2.35.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot