From 338b0e7b0ff24aac2a81775dacb523b45ee83fbd Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 31 Jul 2013 14:40:36 +0300 Subject: grub_2.00: fix compilation when using flex 2.5.37 (From OE-Core rev: 2158003ea4b9879fdef34488462cc59450638218) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../grub/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 (limited to 'meta/recipes-bsp/grub') 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 0000000000..61ae2f5372 --- /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 + +Signed-off-by: Laurentiu Palcu + +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 5153b6a552..e82996d466 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" -- cgit v1.2.3-54-g00ecf