diff options
author | Ross Burton <ross.burton@intel.com> | 2017-01-09 15:28:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-16 18:05:12 +0000 |
commit | 2bc83c8a3b87f29b62fe778ca1e8790604b72d5f (patch) | |
tree | b039a8eaab42f83815f8f175bfab61e9895902df /meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch | |
parent | 171a07091873b5692f74751edc3ae09172ae3d76 (diff) | |
download | poky-2bc83c8a3b87f29b62fe778ca1e8790604b72d5f.tar.gz |
flex: upgrade to 2.6.2
Patches dropped as they are merged upstream:
- CVE-2016-6354.patch
- 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
- do_not_create_pdf_doc.patch
Apply a patch from github to simplify cross-compilation and not need a
flex-native to bootstrap.
(From OE-Core rev: 3632abd01abb8dfff230e18f828af705da488f97)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch')
-rw-r--r-- | meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch deleted file mode 100644 index 438ca5f527..0000000000 --- a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 30 Aug 2016 14:25:32 +0200 | ||
4 | Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | fixes: | ||
10 | |||
11 | | error: C++ style comments are not allowed in ISO C90 | ||
12 | | num_to_alloc = 1; // After all that talk, this was set to 1 anyways... | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
17 | --- | ||
18 | src/flex.skl | 2 +- | ||
19 | src/scan.c | 2 +- | ||
20 | src/skel.c | 2 +- | ||
21 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
22 | |||
23 | diff --git a/src/flex.skl b/src/flex.skl | ||
24 | index 73a0b9e..ed71627 100644 | ||
25 | --- a/src/flex.skl | ||
26 | +++ b/src/flex.skl | ||
27 | @@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) | ||
28 | * scanner will even need a stack. We use 2 instead of 1 to avoid an | ||
29 | * immediate realloc on the next call. | ||
30 | */ | ||
31 | - num_to_alloc = 1; // After all that talk, this was set to 1 anyways... | ||
32 | + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ | ||
33 | YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc | ||
34 | (num_to_alloc * sizeof(struct yy_buffer_state*) | ||
35 | M4_YY_CALL_LAST_ARG); | ||
36 | diff --git a/src/scan.c b/src/scan.c | ||
37 | index b55df2d..f1dce75 100644 | ||
38 | --- a/src/scan.c | ||
39 | +++ b/src/scan.c | ||
40 | @@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) | ||
41 | * scanner will even need a stack. We use 2 instead of 1 to avoid an | ||
42 | * immediate realloc on the next call. | ||
43 | */ | ||
44 | - num_to_alloc = 1; // After all that talk, this was set to 1 anyways... | ||
45 | + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways...*/ | ||
46 | (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc | ||
47 | (num_to_alloc * sizeof(struct yy_buffer_state*) | ||
48 | ); | ||
49 | diff --git a/src/skel.c b/src/skel.c | ||
50 | index ef657d3..26cc889 100644 | ||
51 | --- a/src/skel.c | ||
52 | +++ b/src/skel.c | ||
53 | @@ -2561,7 +2561,7 @@ const char *skel[] = { | ||
54 | " * scanner will even need a stack. We use 2 instead of 1 to avoid an", | ||
55 | " * immediate realloc on the next call.", | ||
56 | " */", | ||
57 | - " num_to_alloc = 1; // After all that talk, this was set to 1 anyways...", | ||
58 | + " num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */", | ||
59 | " YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc", | ||
60 | " (num_to_alloc * sizeof(struct yy_buffer_state*)", | ||
61 | " M4_YY_CALL_LAST_ARG);", | ||
62 | -- | ||
63 | 2.5.5 | ||
64 | |||