<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, May 10, 2013 at 1:15 PM, Bogdan Marinescu <span dir="ltr"><<a href="mailto:bogdan.a.marinescu@intel.com" target="_blank">bogdan.a.marinescu@intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Removed the patches to flex, because they are now applied to the<br>
latest version.<br>
<br>
Signed-off-by: Bogdan Marinescu <<a href="mailto:bogdan.a.marinescu@intel.com">bogdan.a.marinescu@intel.com</a>><br>
---<br>
.../flex/flex/avoid-FORTIFY-warnings.patch | 59 --------------------<br>
.../flex/int-is-not-the-same-size-as-size_t.patch | 42 --------------<br>
meta/recipes-devtools/flex/<a href="http://flex_2.5.35.bb" target="_blank">flex_2.5.35.bb</a> | 11 ----<br>
meta/recipes-devtools/flex/<a href="http://flex_2.5.37.bb" target="_blank">flex_2.5.37.bb</a> | 7 +++<br>
4 files changed, 7 insertions(+), 112 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch<br>
delete mode 100644 meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch<br>
delete mode 100644 meta/recipes-devtools/flex/<a href="http://flex_2.5.35.bb" target="_blank">flex_2.5.35.bb</a><br>
create mode 100644 meta/recipes-devtools/flex/<a href="http://flex_2.5.37.bb" target="_blank">flex_2.5.37.bb</a><br>
<br>
diff --git a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch b/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch<br>
deleted file mode 100644<br>
index c71eb82..0000000<br>
--- a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch<br>
+++ /dev/null<br>
@@ -1,59 +0,0 @@<br>
-Wrap ECHO macro to avoid FORTIFY warnings<br>
-<br>
-This change will enable flex scanners to be compiled with<br>
--D_FORTIFY_SOURCE=2.<br>
-<br>
-Signed-off-by: Manoj Srivastava <<a href="mailto:srivasta@debian.org">srivasta@debian.org</a>><br>
-Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>><br>
-<br>
-Origin: Cherry picked from Debian<br>
-Upstream-Status: Pending<br>
-<br>
----<br>
- flex.skl | 2 +-<br>
- scan.c | 2 +-<br>
- skel.c | 2 +-<br>
- 3 files changed, 3 insertions(+), 3 deletions(-)<br>
-<br>
-diff --git a/flex.skl b/flex.skl<br>
-index 6ebf2fd..eaa355e 100644<br>
---- a/flex.skl<br>
-+++ b/flex.skl<br>
-@@ -1074,7 +1074,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],<br>
- /* This used to be an fputs(), but since the string might contain NUL's,<br>
- * we now use fwrite().<br>
- */<br>
--#define ECHO fwrite( yytext, yyleng, 1, yyout )<br>
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)<br>
- %endif<br>
- %if-c++-only C++ definition<br>
- #define ECHO LexerOutput( yytext, yyleng )<br>
-diff --git a/scan.c b/scan.c<br>
-index d7f5db3..1a079bf 100644<br>
---- a/scan.c<br>
-+++ b/scan.c<br>
-@@ -2093,7 +2093,7 @@ static int input (void );<br>
- /* This used to be an fputs(), but since the string might contain NUL's,<br>
- * we now use fwrite().<br>
- */<br>
--#define ECHO fwrite( yytext, yyleng, 1, yyout )<br>
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)<br>
- #endif<br>
-<br>
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,<br>
-diff --git a/skel.c b/skel.c<br>
-index ee9f6ef..b8a2b4b 100644<br>
---- a/skel.c<br>
-+++ b/skel.c<br>
-@@ -1141,7 +1141,7 @@ const char *skel[] = {<br>
- "/* This used to be an fputs(), but since the string might contain NUL's,",<br>
- " * we now use fwrite().",<br>
- " */",<br>
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",<br>
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",<br>
- "%endif",<br>
- "%if-c++-only C++ definition",<br>
- "#define ECHO LexerOutput( yytext, yyleng )",<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch b/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch<br>
deleted file mode 100644<br>
index 8d05ee4..0000000<br>
--- a/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch<br>
+++ /dev/null<br>
@@ -1,42 +0,0 @@<br>
-int is not the same size as size_t.<br>
-<br>
-Signed-off-by: Manoj Srivastava <<a href="mailto:srivasta@debian.org">srivasta@debian.org</a>><br>
-Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>><br>
-<br>
-Origin: Cherry picked from Debian<br>
-Upstream-Status: Pending<br>
-<br>
----<br>
- gen.c | 2 +-<br>
- scan.c | 2 +-<br>
- 2 files changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/gen.c b/gen.c<br>
-index 848e2c5..5a5daef 100644<br>
---- a/gen.c<br>
-+++ b/gen.c<br>
-@@ -1890,7 +1890,7 @@ void make_tables ()<br>
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");<br>
- outn ("\t\t{ \\");<br>
- outn ("\t\tint c = '*'; \\");<br>
-- outn ("\t\tint n; \\");<br>
-+ outn ("\t\tsize_t n; \\");<br>
- outn ("\t\tfor ( n = 0; n < max_size && \\");<br>
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");<br>
- outn ("\t\t\tbuf[n] = (char) c; \\");<br>
-diff --git a/scan.c b/scan.c<br>
-index 44559b6..15e2058 100644<br>
---- a/scan.c<br>
-+++ b/scan.c<br>
-@@ -2105,7 +2105,7 @@ static int input (void );<br>
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \<br>
- { \<br>
- int c = '*'; \<br>
-- int n; \<br>
-+ size_t n; \<br>
- for ( n = 0; n < max_size && \<br>
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \<br>
- buf[n] = (char) c; \<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-devtools/flex/<a href="http://flex_2.5.35.bb" target="_blank">flex_2.5.35.bb</a> b/meta/recipes-devtools/flex/<a href="http://flex_2.5.35.bb" target="_blank">flex_2.5.35.bb</a><br>
deleted file mode 100644<br>
index 2218c91..0000000<br>
--- a/meta/recipes-devtools/flex/<a href="http://flex_2.5.35.bb" target="_blank">flex_2.5.35.bb</a><br>
+++ /dev/null<br>
@@ -1,11 +0,0 @@<br>
-require flex.inc<br>
-PR = "r3"<br>
-LICENSE="BSD"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"<br>
-BBCLASSEXTEND = "native nativesdk"<br>
-<br>
-SRC_URI += "file://avoid-FORTIFY-warnings.patch \<br>
- file://int-is-not-the-same-size-as-size_t.patch"<br>
-<br>
-SRC_URI[md5sum] = "10714e50cea54dc7a227e3eddcd44d57"<br>
-SRC_URI[sha256sum] = "0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b"<br>
diff --git a/meta/recipes-devtools/flex/<a href="http://flex_2.5.37.bb" target="_blank">flex_2.5.37.bb</a> b/meta/recipes-devtools/flex/<a href="http://flex_2.5.37.bb" target="_blank">flex_2.5.37.bb</a><br>
new file mode 100644<br>
index 0000000..e699fee<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/flex/<a href="http://flex_2.5.37.bb" target="_blank">flex_2.5.37.bb</a><br>
@@ -0,0 +1,7 @@<br>
+require flex.inc<br>
+LICENSE="BSD"<br>
+LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"<br>
+BBCLASSEXTEND = "native nativesdk"<br>
+<br>
+SRC_URI[md5sum] = "c75940e1fc25108f2a7b3ef42abdae06"<br>
+SRC_URI[sha256sum] = "17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.10.4<br>
<br></font></span></blockquote><div><br></div><div style>Last time I've sent this patch, I've been told that it caused some build problems. I was unable to reproduce this issue, so if this happens again, please let me know what I need to do in order to reproduce the build failures.</div>
<div style><br></div><div style>Thanks,</div><div style>Bogdan </div></div><br></div></div>