diff --git a/grub2-fix-build-with-flex-2.6.4.patch b/grub2-fix-build-with-flex-2.6.4.patch new file mode 100644 index 0000000..d7c2d55 --- /dev/null +++ b/grub2-fix-build-with-flex-2.6.4.patch @@ -0,0 +1,24 @@ +From: Andrei Borzenkov + +Fix build with flex 2.6.4+. It no more casts fprintf() call to void, resulting in + +[ 108s] grub_script.yy.c: In function 'yy_fatal_error': +[ 108s] grub_script.yy.c:18:22: error: statement with no effect [-Werror=unused-value] +[ 108s] + +as grub2 defines fprintf as 0. Change it to explicitly define fprintf as (void)0. + +flex commit: https://github.com/westes/flex/commit/a58086a269d3d7367530c1a178644a8e5f1a374f +Index: grub-2.02/grub-core/script/yylex.l +=================================================================== +--- grub-2.02.orig/grub-core/script/yylex.l ++++ grub-2.02/grub-core/script/yylex.l +@@ -91,7 +91,7 @@ typedef size_t yy_size_t; + #define stdin 0 + #define stdout 0 + +-#define fprintf(...) 0 ++#define fprintf(...) (void)0 + #define exit(...) grub_fatal("fatal error in lexer") + #endif + diff --git a/grub2.changes b/grub2.changes index 1d2cfae..ec67cd8 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 4 16:56:33 UTC 2017 - arvidjaar@gmail.com + +- add grub2-fix-build-with-flex-2.6.4.patch - fix build with flex 2.6.4+ + that removed explicit (void) cast from fprintf call in yy_fatal_error. + ------------------------------------------------------------------- Thu Jun 1 09:45:44 UTC 2017 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 3b56112..cd6de16 100644 --- a/grub2.spec +++ b/grub2.spec @@ -169,6 +169,7 @@ Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch8: grub2-ppc-terminfo.patch Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch Patch10: grub2-fix-error-terminal-gfxterm-isn-t-found.patch +Patch11: grub2-fix-build-with-flex-2.6.4.patch Patch12: grub2-fix-menu-in-xen-host-server.patch Patch15: not-display-menu-when-boot-once.patch Patch17: grub2-pass-corret-root-for-nfsroot.patch @@ -435,6 +436,7 @@ swap partition while in resuming %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch12 -p1 %patch15 -p1 %patch17 -p1