mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-01-25 07:42:13 +08:00
corrected svn ci collision
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5804 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
parent
a0e439d940
commit
c5b7d1fa30
@ -44,6 +44,10 @@
|
||||
<listitem>
|
||||
<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>
|
||||
|
@ -338,12 +338,12 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
|
||||
<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 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
|
||||
<screen><userinput>./configure $XORG_CONFIG &&
|
||||
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 @@ ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11/TTF</userinput></scr
|
||||
<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 <linux/types.h>' \
|
||||
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 \
|
||||
|
Loading…
Reference in New Issue
Block a user