Changeset 842cd58

Timestamp:

Aug 14, 2009, 8:13:25 PM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

29f6db3

Parents:

7bca962

Message:

Flex Updates - Yes reallygit status

Location:

BOOK

Files:

• final-system/common/flex.xml (modified) (1 diff)
• final-system/multilib/flex-64bit.xml (modified) (1 diff)
• final-system/multilib/flex-n32.xml (modified) (1 diff)
• final-system/multilib/flex.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)
• temp-system/common/flex.xml (modified) (1 diff)
• temp-system/multilib/flex.xml (modified) (1 diff)

BOOK/final-system/common/flex.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <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>

BOOK/final-system/multilib/flex-64bit.xml

@@ -21 +21 @@
   <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"

BOOK/final-system/multilib/flex-n32.xml

@@ -21 +21 @@
   <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"

BOOK/final-system/multilib/flex.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/materials/common/patches.xml

@@ -94 +94 @@
 
     <varlistentry>
+      <term>Flex GCC 4.4.x Patch - <token>&flex-gcc44-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&flex-gcc44-patch;"/></para>
+        <para>MD5 sum: <literal>&flex-gcc44-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
       <listitem>

BOOK/patches.ent

@@ -37 +37 @@
 <!ENTITY file-cross_compile-patch-size "1 KB">
 
+<!ENTITY flex-gcc44-patch "flex-&flex-version;-gcc44-1.patch">
+<!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
+<!ENTITY flex-gcc44-patch-size "12 KB">
+
 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
 <!ENTITY gcc-branch_update-patch-md5 "ab8fc23fb2814b2d1e4128fa8d02f4e2">

BOOK/temp-system/common/flex.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="t1">Make sure that Flex doesn't try to include

BOOK/temp-system/multilib/flex.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@os='p1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@os='p2'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"