Changeset 229ed25 for BOOK/final-system/common/flex.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/common/flex.xml (modified) (3 diffs)

BOOK/final-system/common/flex.xml

@@ -26 +26 @@
     <title>Installation of Flex</title>
 
-    <para os="p1">The following patch contains fixes to Generate proper
-    GCC 4.4.x code:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&flex-gcc44-patch;</userinput></screen>
-
     <para os="a">Prepare Flex for compilation:</para>
 
@@ -39 +34 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>
@@ -101 +97 @@
       </varlistentry>
 
+      <varlistentry id="flexpp">
+        <term><command>flex++</command></term>
+        <listitem>
+          <para>Link to <command>flex</command> which makes it generate C++
+          scanner classes</para>
+          <indexterm zone="ch-system-flex flexpp">
+            <primary sortas="b-flex++">flex++</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="lex">
         <term><command>lex</command></term>