From e75bbf99e0ecf1e4b7bb96022333d013b5bafecc Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 30 Jul 2013 15:25:01 +0300 Subject: flex: upgrade to 2.5.37 Removed patches since they were included upstream. Added a patch to not compile flex.pdf doc since it needs texi2dvi. (From OE-Core rev: bed86662efdd73be2a0dcde217d44be8e00c0822) Signed-off-by: Laurentiu Palcu [sgw - Dropped PR] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../flex/flex/avoid-FORTIFY-warnings.patch | 59 ---------------------- 1 file changed, 59 deletions(-) delete mode 100644 meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch (limited to 'meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch') diff --git a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch b/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch deleted file mode 100644 index c71eb82792..0000000000 --- a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch +++ /dev/null @@ -1,59 +0,0 @@ -Wrap ECHO macro to avoid FORTIFY warnings - -This change will enable flex scanners to be compiled with --D_FORTIFY_SOURCE=2. - -Signed-off-by: Manoj Srivastava -Signed-off-by: Otavio Salvador - -Origin: Cherry picked from Debian -Upstream-Status: Pending - ---- - flex.skl | 2 +- - scan.c | 2 +- - skel.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/flex.skl b/flex.skl -index 6ebf2fd..eaa355e 100644 ---- a/flex.skl -+++ b/flex.skl -@@ -1074,7 +1074,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], - /* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ --#define ECHO fwrite( yytext, yyleng, 1, yyout ) -+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) - %endif - %if-c++-only C++ definition - #define ECHO LexerOutput( yytext, yyleng ) -diff --git a/scan.c b/scan.c -index d7f5db3..1a079bf 100644 ---- a/scan.c -+++ b/scan.c -@@ -2093,7 +2093,7 @@ static int input (void ); - /* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ --#define ECHO fwrite( yytext, yyleng, 1, yyout ) -+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) - #endif - - /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, -diff --git a/skel.c b/skel.c -index ee9f6ef..b8a2b4b 100644 ---- a/skel.c -+++ b/skel.c -@@ -1141,7 +1141,7 @@ const char *skel[] = { - "/* This used to be an fputs(), but since the string might contain NUL's,", - " * we now use fwrite().", - " */", -- "#define ECHO fwrite( yytext, yyleng, 1, yyout )", -+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)", - "%endif", - "%if-c++-only C++ definition", - "#define ECHO LexerOutput( yytext, yyleng )", --- -1.7.9.5 - -- cgit v1.2.3-54-g00ecf