Просмотр исходного кода

Updated to flex-2.5.37

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9937 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 13 лет назад
Родитель
Сommit
b815cec9c8
4 измененных файлов с 16 добавлено и 10 удалено
  1. 4 0
      chapter01/changelog.xml
  2. 3 4
      chapter06/flex.xml
  3. 6 3
      chapter06/grub.xml
  4. 3 3
      packages.ent

+ 4 - 0
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>

+ 3 - 4
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>

+ 6 - 3
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>
 

+ 3 - 3
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 "">