From b815cec9c87f8b45676c7476dab9af37a19791a3 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 13 Aug 2012 20:20:36 +0000
Subject: [PATCH] Updated to flex-2.5.37

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9937 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter06/flex.xml      | 7 +++----
 chapter06/grub.xml      | 9 ++++++---
 packages.ent            | 6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 43647edc6..507688a77 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-08-13</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to flex-2.5.37. Fixes
+          <ulink url="&lfs-ticket-root;3139">#3139</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to IPRoute2-3.5.1. Fixes
           <ulink url="&lfs-ticket-root;3158">#3158</ulink>.</para>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 996308ba4..9de4a189c 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para>Apply a patch that fixes a bug in the C++ scanner generator, that causes scanner compilation to fail when using GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&flex-gcc-patch;</userinput></screen>
-
     <para>Prepare Flex for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
@@ -57,6 +53,9 @@
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
+    <para>There are two tests that fail due to incompatibilities
+    with the most recent version of bison.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index ea8f649da..34bababd6 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -49,10 +49,13 @@
 <screen><userinput remap="configure">./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --disable-grub-emu-usb \
-            --disable-efiemu</userinput></screen>
+            --disable-efiemu       \
+            --disable-werror</userinput></screen>
 
-    <para>The --disable switches minimize what is built by disabling features
-    and testing programs not really needed for LFS.</para>
+    <para>The --disable-werror option allows the build to complete with
+    warnings introduced by more recent flex versions.  The other --disable
+    switches minimize what is built by disabling features and testing programs
+    not needed for LFS.</para>
 
     <para>Compile the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 870944600..da91279a5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -144,10 +144,10 @@
 <!ENTITY findutils-ch6-du "22 MB">
 <!ENTITY findutils-ch6-sbu "0.5 SBU">
 
-<!ENTITY flex-version "2.5.35">
-<!ENTITY flex-size "1,227 KB">
+<!ENTITY flex-version "2.5.37">
+<!ENTITY flex-size "1,280 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "10714e50cea54dc7a227e3eddcd44d57">
+<!ENTITY flex-md5 "c75940e1fc25108f2a7b3ef42abdae06">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!--
 <!ENTITY flex-ch5-du "">