From d5c71f26a1e8d55efccde7331fd31a482b2ff23d Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Thu, 19 Nov 2009 11:38:31 +0100
Subject: [PATCH] flex: fix for ticket #519

---
 flex/.md5sum                   |  1 +
 flex/Pkgfile                   |  6 ++++--
 flex/flex-2.5.35-gcc44-1.patch | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 flex/flex-2.5.35-gcc44-1.patch

diff --git a/flex/.md5sum b/flex/.md5sum
index c7265cd0..91c1aba0 100644
--- a/flex/.md5sum
+++ b/flex/.md5sum
@@ -1 +1,2 @@
+ad9109820534278c6dd0898178c0788f  flex-2.5.35-gcc44-1.patch
 10714e50cea54dc7a227e3eddcd44d57  flex-2.5.35.tar.bz2
diff --git a/flex/Pkgfile b/flex/Pkgfile
index d02ac519..f1524637 100644
--- a/flex/Pkgfile
+++ b/flex/Pkgfile
@@ -4,11 +4,13 @@
 
 name=flex
 version=2.5.35
-release=1
-source=(http://dl.sourceforge.net/sourceforge/flex/$name-$version.tar.bz2)
+release=2
+source=(http://dl.sourceforge.net/sourceforge/flex/$name-$version.tar.bz2 
+        $name-$version-gcc44-1.patch)
 
 build() {
     cd $name-$version
+    patch -p1 -i $SRC/$name-$version-gcc44-1.patch
     ./configure --prefix=/usr --disable-nls
     make
     make DESTDIR=$PKG install
diff --git a/flex/flex-2.5.35-gcc44-1.patch b/flex/flex-2.5.35-gcc44-1.patch
new file mode 100644
index 00000000..8f0e80fd
--- /dev/null
+++ b/flex/flex-2.5.35-gcc44-1.patch
@@ -0,0 +1,24 @@
+Submitted by: Matt Burgess (matthew at linuxfromscratch dot org)
+Date: 2009-05-03
+Initial Package Version: 2.5.35
+Origin: Matt Burgess
+Upstream Status: Submitted (attached to sourceforge bug 2178663)
+Description: Fixes an error caused by header cleanups in GCC 4.4.0 that is
+             evident from the test suite and would affect any C++ lexers
+             generated by Flex.  Without this patch, Flex will generate lexers
+             containing references to the 'EOF' symbol without including the
+             necessary C++ header file, leading to:
+
+             error: 'EOF' was not declared in this scope 
+
+diff -Naur flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
+--- flex-2.5.35.orig/skel.c	2008-02-26 21:34:19.000000000 +0000
++++ flex-2.5.35/skel.c	2009-05-03 15:18:14.000000000 +0000
+@@ -284,6 +284,7 @@
+   "/* begin standard C++ headers. */",
+   "#include <iostream> ",
+   "#include <errno.h>",
++  "#include <cstdio>",
+   "#include <cstdlib>",
+   "#include <cstring>",
+   "/* end standard C++ headers. */",