summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-07-31 14:40:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:08 +0100
commit338b0e7b0ff24aac2a81775dacb523b45ee83fbd (patch)
tree0cfc011783f41a82ce7de1ed858977c1f973497e /meta/recipes-bsp/grub
parente75bbf99e0ecf1e4b7bb96022333d013b5bafecc (diff)
downloadpoky-338b0e7b0ff24aac2a81775dacb523b45ee83fbd.tar.gz
grub_2.00: fix compilation when using flex 2.5.37
(From OE-Core rev: 2158003ea4b9879fdef34488462cc59450638218) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch21
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb4
2 files changed, 24 insertions, 1 deletions
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 @@
1Upstream-Status: Backport
2
3This fixes compilation issues when using flex-2.5.37. It was taken from upstream.
4
5Original author is: Vladimir Serbinenko <phcoder@gmail.com>
6
7Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
8
9Index: grub-2.00/grub-core/script/yylex.l
10===================================================================
11--- grub-2.00.orig/grub-core/script/yylex.l 2012-06-08 23:24:15.000000000 +0300
12+++ grub-2.00/grub-core/script/yylex.l 2013-07-31 14:34:40.708100982 +0300
13@@ -29,6 +29,8 @@
14 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
15 #pragma GCC diagnostic ignored "-Wmissing-declarations"
16 #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
17+#pragma GCC diagnostic ignored "-Wunused-function"
18+#pragma GCC diagnostic ignored "-Wsign-compare"
19
20 #define yyfree grub_lexer_yyfree
21 #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 \
20 file://grub-2.00-fpmath-sse-387-fix.patch \ 20 file://grub-2.00-fpmath-sse-387-fix.patch \
21 file://remove-gets.patch \ 21 file://remove-gets.patch \
22 file://check-if-liblzma-is-disabled.patch \ 22 file://check-if-liblzma-is-disabled.patch \
23 file://40_custom" 23 file://40_custom \
24 file://fix-issue-with-flex-2.5.37.patch \
25 "
24 26
25SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 27SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
26SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" 28SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"