Przeglądaj źródła

Retain flex static library for automake regression tests.
Remove at the end of Chapter 6.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11025 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 9 lat temu
rodzic
commit
5b7d4da53d
4 zmienionych plików z 16 dodań i 8 usunięć
  1. 11 0
      chapter01/changelog.xml
  2. 1 3
      chapter06/flex.xml
  3. 2 3
      chapter06/revisedchroot.xml
  4. 2 2
      general.ent

+ 11 - 0
chapter01/changelog.xml

@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2016-02-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Retain flex static library for automake
+          regression tests.  Remove at the end of Chapter 6. Fixes
+          <ulink url="&lfs-ticket-root;3894">#3894</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-02-16</para>
       <itemizedlist>

+ 1 - 3
chapter06/flex.xml

@@ -43,9 +43,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 

+ 2 - 3
chapter06/revisedchroot.xml

@@ -43,15 +43,14 @@
 
   <para>Finally, there were several static libraries that were not supressed earlier
   in the chapter in order to satisfy the regression tests in several packages. These 
-  libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib.  If desired,
+  libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
   remove them now:</para>
 
 <screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
 rm -f /usr/lib/libbz2.a
 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 rm -f /usr/lib/libltdl.a
+rm -f /usr/lib/libfl.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
-<!-- Flex shared library is broken. Keep static until next flex release. -->
-
 </sect1>

+ 2 - 2
general.ent

@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20160219">
+<!ENTITY version         "SVN-20160226">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "February 19, 2016">
+<!ENTITY releasedate     "February 26, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->