Author: dnicholson
Date: 2007-05-24 08:53:23 -0600 (Thu, 24 May 2007)
New Revision: 6774
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/xfree86.xml
Log:
Patch for building XFree86 against newer FreeType
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2007-05-23 18:13:07 UTC (rev 6773)
+++ trunk/BOOK/general.ent 2007-05-24 14:53:23 UTC (rev 6774)
@@ -3,11 +3,11 @@
$Date$
-->
-<!ENTITY day "23"> <!-- Always 2 digits -->
+<!ENTITY day "24"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2007">
<!ENTITY version "svn-&year;&month;&day;">
-<!ENTITY releasedate "May &day;rd, &year;">
+<!ENTITY releasedate "May &day;th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2007-05-23 18:13:07 UTC
(rev 6773)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2007-05-24 14:53:23 UTC
(rev 6774)
@@ -42,6 +42,16 @@
-->
<listitem>
+ <para>May 24th, 2007</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dnicholson] - A patch was added to allow XFree86 against
+ newer FreeType releases.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>May 23rd, 2007</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml 2007-05-23 18:13:07 UTC (rev 6773)
+++ trunk/BOOK/x/installing/xfree86.xml 2007-05-24 14:53:23 UTC (rev 6774)
@@ -59,6 +59,14 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>Required patch: <ulink
+
url="&patch-root;/XFree86-&xfree86-version;-freetype_internals-1.patch"/></para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">XFree86 Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -172,6 +180,28 @@
<sect3>
+ <title>Preparing the Sources</title>
+
+ <para>Three fixes are needed for <application>XFree86</application>.
+ First, a patch is needed to build against newer
<application>FreeType</application>
+ releases. Second, the macro "PAGE_MASK" is manually defined because
+ including <filename>asm/page.h</filename> from the Linux kernel headers
+ does not work when compiling with <parameter>-ansi</parameter>. Finally,
+ the Linux kernel headers no longer install the unneeded header
+ <filename>linux/config.h</filename>. A <command>sed</command> is used
+ to remove all usage of this header. Perform these actions with the
+ following commands:</para>
+
+<screen><userinput>patch -Np1 -i
../XFree86-&xfree86-version;-freetype_internals-1.patch &&
+sed -i '/page.h/c #define PAGE_MASK (~(getpagesize() - 1))' \
+ programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &&
+grep -rl '^#include <linux/config.h>' . | \
+ xargs sed -i '[EMAIL PROTECTED]
<linux/config.h>@d'</userinput></screen>
+
+ </sect3>
+
+ <sect3>
+
<title>Setting Up a Shadow Directory</title>
<para>When building <application>XFree86</application>, you should create
@@ -267,12 +297,7 @@
<para>Install <application>XFree86</application> by running the
following commands:</para>
-<screen><userinput>sed -i 's:^.*asm.*$:# define PAGE_MASK (~(getpagesize() -
1)):' \
- ../xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &&
-sed -i -e "[EMAIL PROTECTED] <linux/config.h>@/* & */@" \
- `grep -lr linux/config.h ../xc` &&
-( make World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS )
-</userinput></screen>
+<screen><userinput>( make World 2>&1 | tee xfree-compile.log &&
exit $PIPESTATUS )</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -352,20 +377,6 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><command>sed -i 's:^.*asm.* ... fbdevhw.c</command>: This sed fixes a
- problem compiling against headers from kernels newer than
linux-2.6.8.</para>
-
- <para><command>sed -i -e "[EMAIL PROTECTED]
<linux/config.h>@...</command>:
- The <application>Linux-Libc-Headers</application> package installed in
- LFS installs a <filename>/usr/include/linux/config.h</filename> file which
- is not compatible with userspace applications. The recommended fix for
- applications including this file is to remove it (see <ulink
- url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/FAQ";>
- linux-libc-headers FAQ</ulink>). The <command>sed</command> uses
- <command>grep -lr</command> to replace all occurrences. If you desire, just
- remove (comment) the line in the appropriate video driver file if you
- customized <filename>host.def</filename>.</para>
-
<para><command>( make World 2>&1 | tee xfree-compile.log
&& exit $PIPESTATUS )</command>:
This command runs multiple <filename>Makefile</filename>s to completely
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
