Changeset 2b6c440 for chapter05

Timestamp:

12/17/2004 08:01:07 PM (20 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Children:

83865af

Parents:

c30ef42

Message:

Merged stuff from RAQ2 in chapter05.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multi-arch/BOOK@4403 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter05

Files:

• adjusting.xml (modified) (4 diffs)
• glibc.xml (modified) (1 diff)
• grep.xml (modified) (1 diff)
• linux-libc-headers.xml (modified) (1 diff)

chapter05/adjusting.xml

@@ -37 +37 @@
 <!-- Ampersands are needed to allow copy and paste -->
 
-<screen><userinput>SPECFILE=`gcc --print-file specs` &amp;&amp;
+<screen arch="x86"><userinput>SPECFILE=`gcc --print-file specs` &amp;&amp;
 sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
+    $SPECFILE &gt; tempspecfile &amp;&amp;
+mv -f tempspecfile $SPECFILE &amp;&amp;
+unset SPECFILE</userinput></screen>
+
+<screen arch="raq2"><userinput>SPECFILE=`gcc --print-file specs` &amp;&amp;
+sed 's@ /lib/ld.so.1@ /tools/lib/ld.so.1@g' \
     $SPECFILE &gt; tempspecfile &amp;&amp;
 mv -f tempspecfile $SPECFILE &amp;&amp;
@@ -47 +53 @@
 <beginpage/>
 Alternatively, the specs file can be edited by hand. This is done by
-replacing every occurrence of <quote>/lib/ld-linux.so.2</quote> with
-<quote>/tools/lib/ld-linux.so.2</quote></para>
+replacing every occurrence of <quote arch="x86">/lib/ld-linux.so.2</quote> 
+<quote arch="raq2">/lib/ld.so.1</quote> with <quote arch="x86">/tools/lib/ld-linux.so.2</quote>
+<quote arch="raq2">/tools/lib/ld.so.2</quote></para>
 
 <para>Be sure to visually inspect the specs file in order to verify the
 intended changes have been made.</para>
+
+<!-- For specific arch books, the next para isn't needed, IMHO.
 
 <important><para>If working on a platform where the name of the
@@ -60 +69 @@
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>
+-->
 
 <para>There is a possibility that some include files from the host
@@ -84 +94 @@
 and the output of the last command will be of the form:</para>
 
-<screen><computeroutput>[Requesting program interpreter: 
+<screen arch="x86"><computeroutput>[Requesting program interpreter: 
     /tools/lib/ld-linux.so.2]</computeroutput></screen>
+
+<screen arch="raq2"><computeroutput>[Requesting program interpreter: 
+    /tools/lib/ld.so.1]</computeroutput></screen>
 
 <para>Note that <filename class="directory">/tools/lib</filename>

chapter05/glibc.xml

@@ -38 +38 @@
 the method suggested in this book puts the stability of the system at
 risk.</para>
+
+<para arch="raq2">NPTL is not supported under the MIPS architecture, so we are going to
+remove the nptl directory from the Glibc source:</para>
+
+<screen arch="raq2"><userinput>rm -rf nptl</userinput></screen>
+
+<para arch="raq2">This patch fixes a librt linking issue.</para>
+
+<screen arch="raq2"><userinput>patch -Np1 -i ../glibc-&glibc-version;-raq2_librt_linking-1.patch</userinput></screen>
+
+<para arch="raq2">This patch contains all the necessary patches for RaQ2 server.</para>
+
+<screen arch="raq2"><userinput>patch -Np1 -i ../glibc-&glibc-version;-raq2_fixes-1.patch</userinput></screen>
 
 <para>The Glibc documentation recommends building Glibc outside of the source

chapter05/grep.xml

@@ -27 +27 @@
 <sect2 role="installation">
 <title>Installation of Grep</title>
+
+<para arch="raq2">This patch updates config.guess and config.sub for RaQ2 servers.</para>
+
+<screen arch="raq2"><userinput>patch -Np1 -i ../grep-&grep-version;-raq2_config_update-1.patch</userinput></screen>
 
 <para>Prepare Grep for compilation:</para>

chapter05/linux-libc-headers.xml

@@ -41 +41 @@
 Interface (API) stable version of the Linux headers.</para>
 
+<para arch="raq2">This patch fixes a compile issue with Glibc on a RaQ2 server.</para>
+
+<screen arch="raq2"><userinput>patch -Np1 -i ../linux-libc-headers-&linux-libc-headers-version;-raq2_fix-1.patch</userinput></screen>
+
 <para>Install the header files:</para>