diff options
Diffstat (limited to 'meta/packages/flex/files')
-rw-r--r-- | meta/packages/flex/files/fix-gen.patch | 17 | ||||
-rw-r--r-- | meta/packages/flex/files/flex-lvalue.diff | 36 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/packages/flex/files/fix-gen.patch b/meta/packages/flex/files/fix-gen.patch new file mode 100644 index 0000000000..55f4f6fdf5 --- /dev/null +++ b/meta/packages/flex/files/fix-gen.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- flex-2.5.31/gen.c~fix-gen | ||
7 | +++ flex-2.5.31/gen.c | ||
8 | @@ -1812,8 +1812,7 @@ | ||
9 | if (yytext_is_array) { | ||
10 | if (!reentrant){ | ||
11 | indent_puts ("static int yy_more_offset = 0;"); | ||
12 | - }else{ | ||
13 | - indent_puts ("static int yy_prev_more_offset = 0;"); | ||
14 | + indent_puts ("static int yy_prev_more_offset = 0;"); | ||
15 | } | ||
16 | } | ||
17 | else if (!reentrant) { | ||
diff --git a/meta/packages/flex/files/flex-lvalue.diff b/meta/packages/flex/files/flex-lvalue.diff new file mode 100644 index 0000000000..56ae539a6c --- /dev/null +++ b/meta/packages/flex/files/flex-lvalue.diff | |||
@@ -0,0 +1,36 @@ | |||
1 | Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi/flex-lvalue.diff?bug=194844;msg=10;att=1 | ||
2 | |||
3 | according to posix 0,1,2 are already setup and this avoids | ||
4 | the issues with | ||
5 | | filter.c: In function 'filter_apply_chain': | ||
6 | | filter.c:161: error: invalid lvalue in assignment | ||
7 | | filter.c:163: error: invalid lvalue in assignment | ||
8 | | filter.c:184: error: invalid lvalue in assignment | ||
9 | |||
10 | |||
11 | diff -ur flex-2.5.31.ORIG/filter.c flex-2.5.31/filter.c | ||
12 | --- flex-2.5.31.ORIG/filter.c 2003-03-25 16:39:08.000000000 +0000 | ||
13 | +++ flex-2.5.31/filter.c 2003-05-27 17:00:26.000000000 +0000 | ||
14 | @@ -157,11 +157,8 @@ | ||
15 | if (chain->filter_func) { | ||
16 | int r; | ||
17 | |||
18 | - /* setup streams again */ | ||
19 | - if ((stdin = fdopen (0, "r")) == NULL) | ||
20 | - flexfatal (_("fdopen(0) failed")); | ||
21 | - if ((stdout = fdopen (1, "w")) == NULL) | ||
22 | - flexfatal (_("fdopen(1) failed")); | ||
23 | + /* POSIX says we inherit fd[0-2], so we don't need | ||
24 | + to do anything to them here */ | ||
25 | |||
26 | if ((r = chain->filter_func (chain)) == -1) | ||
27 | flexfatal (_("filter_func failed")); | ||
28 | @@ -181,8 +178,6 @@ | ||
29 | if (dup2 (pipes[1], 1) == -1) | ||
30 | flexfatal (_("dup2(pipes[1],1)")); | ||
31 | close (pipes[1]); | ||
32 | - if ((stdout = fdopen (1, "w")) == NULL) | ||
33 | - flexfatal (_("fdopen(1) failed")); | ||
34 | |||
35 | return true; | ||
36 | } | ||