diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-02-26 19:59:11 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-02-26 19:59:11 +0000 |
| commit | 5b7d4da53d4b85613e3f998eb554d13cb62de16c (patch) | |
| tree | 793434460e0ed8a3442dfa49998df602ce9f31e8 | |
| parent | a8854787c11644fdd2dadcb81f1a9d9f6b44c477 (diff) | |
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
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter06/flex.xml | 4 | ||||
| -rw-r--r-- | chapter06/revisedchroot.xml | 5 | ||||
| -rw-r--r-- | general.ent | 4 |
4 files changed, 16 insertions, 8 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0fb948ac7..8ee7502af 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,17 @@ </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> <listitem> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index c0adcfb58..2d0f80cdd 100644 --- a/chapter06/flex.xml +++ b/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> diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml index 40c69c6be..cd9dfb22f 100644 --- a/chapter06/revisedchroot.xml +++ b/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> diff --git a/general.ent b/general.ent index b5f5b8645..76e89b2ff 100644 --- a/general.ent +++ b/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 – --> <!ENTITY milestone "7.9"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |