r5804 - in trunk/BOOK: introduction/welcome x/installing

[dj]

Author: dj
Date: 2006-04-04 23:28:06 -0600 (Tue, 04 Apr 2006)
New Revision: 5804

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
corrected svn ci collision

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2006-04-05 05:04:31 UTC 
(rev 5803)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2006-04-05 05:28:06 UTC 
(rev 5804)
@@ -45,6 +45,10 @@
       <para>April 5th, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[dj] - Added sed to correct glibc header problem in 
+          xorg-server.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Added Wireless Tools.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml   2006-04-05 05:04:31 UTC (rev 5803)
+++ trunk/BOOK/x/installing/xorg7.xml   2006-04-05 05:28:06 UTC (rev 5804)
@@ -338,12 +338,12 @@
     <sect3 role="installation">
       <title>Installation of Xorg Data</title>
 
-      <para>First, install the xbitmap package by running the following
-      commands:</para>
+      <para>First, configure the xbitmap package by running the following
+      command:</para>
 
 <screen><userinput>./configure $XORG_CONFIG</userinput></screen>
 
-      <para>Now as the <systemitem class="username">root</systemitem>
+      <para>Now install as the <systemitem class="username">root</systemitem>
       user:</para>
 
 <screen><userinput role="root">make install</userinput></screen>
@@ -361,8 +361,8 @@
 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
-      <para>As the <systemitem class="username">root</systemitem>
-      user:</para>
+      <para>Install the packages as the 
+      <systemitem class="username">root</systemitem> user:</para>
 
 <screen><userinput role="root">make install</userinput></screen>
 
@@ -515,6 +515,14 @@
         <application>Xorg-server</application>.</para>
       </note>
 
+<!-- To be removed if/when proposed glibc patch is added to LFS SVN-->
+      <para>Execute the following sed command to work around a broken
+      <application>glibc</application> header file:</para>
+
+<screen><userinput>sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
+        hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
+<!-- End remove -->
+
       <para>Install the server by running the following commands:</para>
 
 <screen><userinput>./configure $XORG_CONFIG \

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page