- merge rawhide fix for generation of broken code (conflicting isatty()

  prototype w/ glibc 2.2) This broke, among other things, the kdelibs
  2.0 build.

Changed files:
    flex-glibc22.patch -> 1.1

diff --git a/flex-glibc22.patch b/flex-glibc22.patch
new file mode 100644 (file)
index 0000000..299aa70
--- /dev/null
+++ b/flex-glibc22.patch
@@ -0,0 +1,108 @@
+--- flex-2.5.4/initscan.c.broken       Sat Sep 30 16:50:31 2000
++++ flex-2.5.4/initscan.c      Sat Sep 30 16:51:34 2000
+@@ -10,7 +10,7 @@
+ #define YY_FLEX_MINOR_VERSION 5
+ 
+ #include <stdio.h>
+-
++#include <unistd.h>
+ 
+ /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+ #ifdef c_plusplus
+@@ -23,7 +23,6 @@
+ #ifdef __cplusplus
+ 
+ #include <stdlib.h>
+-#include <unistd.h>
+ 
+ /* Use prototypes in function declarations. */
+ #define YY_USE_PROTOS
+@@ -3310,12 +3309,6 @@
+       yy_flex_free( (void *) b );
+       }
+ 
+-
+-#ifndef YY_ALWAYS_INTERACTIVE
+-#ifndef YY_NEVER_INTERACTIVE
+-extern int isatty YY_PROTO(( int ));
+-#endif
+-#endif
+ 
+ #ifdef YY_USE_PROTOS
+ void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+--- flex-2.5.4/flex.skl.broken Sat Sep 30 16:51:05 2000
++++ flex-2.5.4/flex.skl        Sat Sep 30 16:52:24 2000
+@@ -10,6 +10,7 @@
+ 
+ %-
+ #include <stdio.h>
++#include <unistd.h>
+ %*
+ 
+ 
+@@ -27,7 +28,6 @@
+ %+
+ class istream;
+ %*
+-#include <unistd.h>
+ 
+ /* Use prototypes in function declarations. */
+ #define YY_USE_PROTOS
+@@ -1177,11 +1177,6 @@
+ 
+ 
+ %-
+-#ifndef YY_ALWAYS_INTERACTIVE
+-#ifndef YY_NEVER_INTERACTIVE
+-extern int isatty YY_PROTO(( int ));
+-#endif
+-#endif
+ 
+ #ifdef YY_USE_PROTOS
+ void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+@@ -1192,7 +1187,6 @@
+ #endif
+ 
+ %+
+-extern "C" int isatty YY_PROTO(( int ));
+ void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
+ %*
+ 
+--- flex-2.5.4/skel.c.broken   Sat Sep 30 16:52:34 2000
++++ flex-2.5.4/skel.c  Sat Sep 30 16:53:15 2000
+@@ -15,6 +15,7 @@
+   "",
+   "%-",
+   "#include <stdio.h>",
++  "#include <unistd.h>",
+   "%*",
+   "",
+   "",
+@@ -32,7 +33,6 @@
+   "%+",
+   "class istream;",
+   "%*",
+-  "#include <unistd.h>",
+   "",
+   "/* Use prototypes in function declarations. */",
+   "#define YY_USE_PROTOS",
+@@ -1182,11 +1182,6 @@
+   "",
+   "",
+   "%-",
+-  "#ifndef YY_ALWAYS_INTERACTIVE",
+-  "#ifndef YY_NEVER_INTERACTIVE",
+-  "extern int isatty YY_PROTO(( int ));",
+-  "#endif",
+-  "#endif",
+   "",
+   "#ifdef YY_USE_PROTOS",
+   "void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )",
+@@ -1197,7 +1192,6 @@
+   "#endif",
+   "",
+   "%+",
+-  "extern \"C\" int isatty YY_PROTO(( int ));",
+   "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )",
+   "%*",
+   "",