r1290 - / trunk/BOOK trunk/BOOK/final-system trunk/BOOK/final-system/common trunk/BOOK/final-system/mips trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/mips64-64 trunk/BOOK/final-system/multilib trunk/BOOK/introduction/common trunk/BOOK/materials/common trunk/BOOK/materials/mips trunk/BOOK/materials/mips64 trunk/BOOK/materials/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Mar 15 22:19:21 PST 2006


Author: jim
Date: 2006-03-15 23:19:19 -0700 (Wed, 15 Mar 2006)
New Revision: 1290

Added:
   trunk/BOOK/final-system/multilib/flex-n32.xml
Removed:
   trunk/BOOK/final-system/mips/flex.xml
   trunk/BOOK/final-system/mips64-64/flex.xml
   trunk/BOOK/final-system/mips64/flex-64bit.xml
   trunk/BOOK/final-system/mips64/flex-n32.xml
   trunk/BOOK/final-system/mips64/flex.xml
Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/common/flex.xml
   trunk/BOOK/final-system/mips-chapter.xml
   trunk/BOOK/final-system/mips64-64-chapter.xml
   trunk/BOOK/final-system/mips64-chapter.xml
   trunk/BOOK/final-system/multilib/flex-64bit.xml
   trunk/BOOK/final-system/multilib/flex.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
Log:
 r2628 at server (orig r1290):  jim | 2006-03-15 22:17:54 -0800
  r2626 at server:  jim | 2006-03-15 22:15:21 -0800
  Updated to Flex 2.5.33
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1289
   + b6734a72-470d-0410-b049-f317dca95413:/:1290


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2621
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2626
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/common/flex.xml
===================================================================
--- trunk/BOOK/final-system/common/flex.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/common/flex.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -34,11 +34,6 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para os="a">Flex contains several known bugs. Fix these with the following
-    patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
-
     <para os="c">The GNU autotools detects that the Flex source code has been
     modified by the previous patch and tries to update the man page
     accordingly. This does not work correctly on many systems, and the

Deleted: trunk/BOOK/final-system/mips/flex.xml
===================================================================
--- trunk/BOOK/final-system/mips/flex.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips/flex.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="p1">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-</sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips-chapter.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips-chapter.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -33,7 +33,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>

Deleted: trunk/BOOK/final-system/mips64/flex-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex-64bit.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64/flex-64bit.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex-64bit.html"?>
-
-  <title>Flex-&flex-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>

Deleted: trunk/BOOK/final-system/mips64/flex-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex-n32.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64/flex-n32.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-n32" role="wrap">
-  <?dbhtml filename="flex-n32.html"?>
-
-  <title>Flex-&flex-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-flex-n32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib32</filename>. Create a symlink to account for
-    this:</para>
-
-<screen os="m"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/BOOK/final-system/mips64/flex.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64/flex.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-32" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-flex-32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/BOOK/final-system/mips64-64/flex.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/flex.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64-64/flex.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="ba">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
-
-<screen os="bb"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-</sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -33,7 +33,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>

Modified: trunk/BOOK/final-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/mips64-chapter.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -41,9 +41,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>

Modified: trunk/BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/flex-64bit.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/multilib/flex-64bit.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -23,14 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Added: trunk/BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/flex-n32.xml	                        (rev 0)
+++ trunk/BOOK/final-system/multilib/flex-n32.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-flex-n32" role="wrap">
+  <?dbhtml filename="flex-n32.html"?>
+
+  <title>Flex-&flex-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-flex-n32">
+    <primary sortas="a-Flex">Flex</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Flex</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+   --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">There are some packages that expect to find the
+    <filename class="libraryfile">lex</filename> library in <filename
+    class="directory">/usr/lib32</filename>. Create a symlink to account for
+    this:</para>
+
+<screen os="m"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-flex" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/final-system/multilib/flex.xml
===================================================================
--- trunk/BOOK/final-system/multilib/flex.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/final-system/multilib/flex.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -24,14 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -45,6 +45,9 @@
         <listitem>
           <para>[jim] - Updated to Psmisc 22.2.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Updated to Flex 2.5.33.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/materials/common/patches.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -18,7 +18,7 @@
 
   <variablelist role="materials">
 
-    <varlistentry os="p1">
+    <varlistentry>
       <term>Bash Fixes Patch - 15 KB:</term>
       <listitem>
         <para><ulink
@@ -26,7 +26,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p2">
+    <varlistentry>
       <term>Binutils Posix Patch - 4.9 KB:</term>
       <listitem>
         <para><ulink
@@ -34,7 +34,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p3">
+    <varlistentry>
       <term>Bzip2 Bzgrep Security Fixes Patch - 1.3 KB:</term>
       <listitem>
         <para><ulink
@@ -50,7 +50,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p4">
+    <varlistentry>
       <term>Bzip2 Documentation Patch - 1.7 KB:</term>
       <listitem>
         <para><ulink
@@ -58,7 +58,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p5">
+    <varlistentry>
       <term>Coreutils Suppress Uptime, Kill, Su Patch - 13 KB:</term>
       <listitem>
         <para><ulink
@@ -66,7 +66,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p6">
+    <varlistentry>
       <term>Expect Spawn Patch - 6.9 KB:</term>
       <listitem>
         <para><ulink
@@ -74,15 +74,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p7">
-      <term>Flex Brokenness Patch - 157 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="p8">
+    <varlistentry>
       <term>Gawk Segfault Patch - 1.3 KB:</term>
       <listitem>
         <para><ulink
@@ -90,7 +82,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p9">
+    <varlistentry>
       <term>GCC Cross Search Paths Patch - 2 KB:</term>
       <listitem>
         <para><ulink
@@ -98,7 +90,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p10">
+    <varlistentry>
       <term>GCC Posix Patch - 8.6 KB:</term>
       <listitem>
         <para><ulink
@@ -106,7 +98,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p11">
+    <varlistentry>
       <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
       <listitem>
         <para><ulink
@@ -114,7 +106,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p12">
+    <varlistentry>
       <term>Glibc Localedef Segfault - 1.9 KB:</term>
       <listitem>
         <para><ulink
@@ -122,7 +114,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p13">
+    <varlistentry>
       <term>Gzip Security Fix Patch - 2 KB:</term>
       <listitem>
         <para><ulink
@@ -130,7 +122,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p14">
+    <varlistentry>
       <term>Inetutils GCC 4.x Fixes Patch - 1.3 KB:</term>
       <listitem>
         <para><ulink
@@ -138,7 +130,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p15">
+    <varlistentry>
       <term>Inetutils No-Server-Man-Pages Patch - 4.1 KB:</term>
       <listitem>
         <para><ulink
@@ -146,7 +138,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p16">
+    <varlistentry>
       <term>KBD GCC 4.x Fixes Patch - 1.5 KB:</term>
       <listitem>
         <para><ulink
@@ -154,7 +146,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p17">
+    <varlistentry>
       <term>Mktemp Tempfile Patch - 3.6 KB:</term>
       <listitem>
         <para><ulink
@@ -162,7 +154,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p18">
+    <varlistentry>
       <term>Perl Libc Patch - 1.1 KB:</term>
       <listitem>
         <para><ulink
@@ -170,7 +162,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p20">
+    <varlistentry>
       <term>Readline Fixes Patch - 2.1 KB:</term>
       <listitem>
         <para><ulink
@@ -178,7 +170,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p21">
+    <varlistentry>
       <term>Sysklogd Fixes Patch - 28 KB:</term>
       <listitem>
         <para><ulink
@@ -186,7 +178,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p22">
+    <varlistentry>
       <term>Tar GCC-4.x Fix Patch - 1.2 KB:</term>
       <listitem>
         <para><ulink
@@ -194,7 +186,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p23">
+    <varlistentry>
       <term>Tar Sparse Fix Patch - 1 KB:</term>
       <listitem>
         <para><ulink
@@ -202,28 +194,28 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p24">
+    <varlistentry>
        <term>Texinfo Tempfile Fix Patch - 2.2 KB:</term>
        <listitem>
           <para><ulink url="&patches-root;texinfo/&texinfo-tempfile_fix-patch;"/></para>
        </listitem>
     </varlistentry>
 
-    <varlistentry os="p25">
+    <varlistentry>
       <term>Util-linux Cramfs Patch - 2.8 KB:</term> <listitem>
         <para><ulink
         url="&patches-root;util-linux/&util-linux-cramfs-patch;"/></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p26">
+    <varlistentry>
       <term>Util-linux GCC 4.x Patch - 1 KB:</term> <listitem>
         <para><ulink
         url="&patches-root;util-linux/&util-linux-gcc4_fixes-patch;"/></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry os="p27">
+    <varlistentry>
       <term>Zlib fPIC Patch - 3.2 KB:</term> <listitem>
         <para><ulink
         url="&patches-root;zlib/&zlib-fpic-patch;"/></para>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/materials/mips/patches.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -36,14 +36,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="flex-mips_update-patch">
-      <term>Flex Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="gcc-mips_tls-patch">
       <term>GCC MIPS TLS Patch - 16 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -37,10 +37,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-03-16 06:19:19 UTC (rev 1290)
@@ -30,10 +30,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/packages.ent	2006-03-16 06:19:19 UTC (rev 1290)
@@ -85,8 +85,8 @@
 <!ENTITY findutils-size "1.1 MB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
 
-<!ENTITY flex-version "2.5.31">
-<!ENTITY flex-size "666 KB">
+<!ENTITY flex-version "2.5.33">
+<!ENTITY flex-size "680 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2?download">
 
 <!ENTITY gawk-version "3.1.5">

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-03-15 23:58:37 UTC (rev 1289)
+++ trunk/BOOK/patches.ent	2006-03-16 06:19:19 UTC (rev 1290)
@@ -13,8 +13,6 @@
 
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-2.patch">
 
-<!ENTITY flex-fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
-
 <!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
 
 <!ENTITY gcc-cross_search-patch "gcc-&gcc-version;-cross_search_paths-1.patch">




More information about the cross-lfs mailing list