Patchwork [13/13] grub_2.00: fix compilation when using flex 2.5.37

login
register
mail settings
Submitter Laurentiu Palcu
Date July 31, 2013, 1:09 p.m.
Message ID <d4fd41ac7f0e3497a7aa06f3ede228c2d9bea16d.1375275560.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/54857/
State Accepted
Commit 2158003ea4b9879fdef34488462cc59450638218
Headers show

Comments

Laurentiu Palcu - July 31, 2013, 1:09 p.m.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../grub-2.00/fix-issue-with-flex-2.5.37.patch     |   21 ++++++++++++++++++++
 meta/recipes-bsp/grub/grub_2.00.bb                 |    4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch

Patch

diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch b/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
new file mode 100644
index 0000000..61ae2f5
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch
@@ -0,0 +1,21 @@ 
+Upstream-Status: Backport
+
+This fixes compilation issues when using flex-2.5.37. It was taken from upstream.
+
+Original author is: Vladimir Serbinenko  <phcoder@gmail.com>
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: grub-2.00/grub-core/script/yylex.l
+===================================================================
+--- grub-2.00.orig/grub-core/script/yylex.l	2012-06-08 23:24:15.000000000 +0300
++++ grub-2.00/grub-core/script/yylex.l	2013-07-31 14:34:40.708100982 +0300
+@@ -29,6 +29,8 @@
+ #pragma GCC diagnostic ignored "-Wmissing-prototypes"
+ #pragma GCC diagnostic ignored "-Wmissing-declarations"
+ #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
++#pragma GCC diagnostic ignored "-Wunused-function"
++#pragma GCC diagnostic ignored "-Wsign-compare"
+ 
+ #define yyfree    grub_lexer_yyfree
+ #define yyalloc   grub_lexer_yyalloc
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index 5153b6a..e82996d 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -20,7 +20,9 @@  SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
           file://grub-2.00-fpmath-sse-387-fix.patch \
           file://remove-gets.patch \
           file://check-if-liblzma-is-disabled.patch \
-          file://40_custom"
+          file://40_custom \
+          file://fix-issue-with-flex-2.5.37.patch \
+          "
 
 SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
 SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"