Author: jhuntwork
Date: 2006-01-29 18:45:25 -0700 (Sun, 29 Jan 2006)
New Revision: 7314
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter06/gcc.xml
trunk/BOOK/chapter06/readjusting.xml
trunk/BOOK/general.ent
Log:
Restore the use of *startfile_prefix_spec
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2006-01-29 19:53:38 UTC (rev 7313)
+++ trunk/BOOK/chapter01/changelog.xml 2006-01-30 01:45:25 UTC (rev 7314)
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>January 29, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jhuntwork] - Restore the use of *startfile_prefix_spec.
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 26, 2006</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/chapter06/gcc.xml
===================================================================
--- trunk/BOOK/chapter06/gcc.xml 2006-01-29 19:53:38 UTC (rev 7313)
+++ trunk/BOOK/chapter06/gcc.xml 2006-01-30 01:45:25 UTC (rev 7314)
@@ -99,6 +99,11 @@
<screen><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
+<para>Many packages use the name <command>cc</command> to call the C
+compiler. To satisfy those packages, create a symlink:</para>
+
+<screen><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+
<note><para>At this point, it is strongly recommended to repeat the
sanity check performed earlier in this chapter. Refer back to <xref
linkend="ch-system-readjusting" role=","/> and repeat the check. If the results
Modified: trunk/BOOK/chapter06/readjusting.xml
===================================================================
--- trunk/BOOK/chapter06/readjusting.xml 2006-01-29 19:53:38 UTC (rev
7313)
+++ trunk/BOOK/chapter06/readjusting.xml 2006-01-30 01:45:25 UTC (rev
7314)
@@ -19,18 +19,24 @@
directory to the LFS <filename class="directory">/{,usr/}lib</filename>
directories.</para>
-<para>First, create a symlink to the adjusted linker we created in chapter
5.</para>
+<para>First, backup the <filename class="directory">/tools</filename> linker,
and
+replace it with the adjusted linker we made in chapter 5. We'll also create a
+link to its counterpart in <filename
class="directory">/tools/$MACHTYPE/bin</filename></para>
-<screen><userinput>ln -sv /tools/bin/ld-new /usr/bin/ld</userinput></screen>
+<screen><userinput>mv -v /tools/bin/{ld,ld-old}
+mv -v /tools/$MACHTYPE/bin/{ld,ld-old}
+mv -v /tools/bin/{ld-new,ld}
+ln -sv /tools/bin/ld /tools/$MACHTYPE/bin/ld</userinput></screen>
<para>Next, amend the GCC specs file so that it points to the new
-dynamic linker. A <command>sed</command> command accomplishes this:</para>
+dynamic linker, and so that GCC knows where to find its start files.
+A <command>perl</command> command accomplishes this:</para>
-<screen><userinput>SPECFILE=`dirname $(gcc -print-libgcc-file-name)`/specs
&&
-gcc -dumpspecs > $SPECFILE &&
-sed -i -e '/^\*link:$/{n;s,$, -L/usr/lib,}' \
- -e '[EMAIL PROTECTED]/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]'
$SPECFILE &&
-unset SPECFILE</userinput></screen>
+<screen><userinput>gcc -dumpspecs | \
+perl -pi -e 's@/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED];' \
+ -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \
+ `dirname $(gcc --print-libgcc-file-name)`/specs
+</userinput></screen>
<para>It is a good idea to visually inspect the specs file to verify the
intended
change was actually made.</para>
@@ -43,18 +49,6 @@
linkend="ch-tools-toolchaintechnotes" role=","/> if
necessary.</para></important>
-<para>Now create a temporary wrapper script for <filename>gcc</filename>.
-This script will point to the real <filename>gcc</filename>
-in <filename class="directory">/tools</filename> but with adjusted parameters
-to ensure that GCC in the next section links to our newly installed
Glibc.</para>
-
-<screen><userinput>cat > /usr/bin/gcc << "EOF"
-#!/bin/bash
-/tools/bin/gcc -B/usr/lib/ -B/usr/bin/ $@
-EOF
-chmod 755 /usr/bin/gcc
-ln -s gcc /usr/bin/cc</userinput></screen>
-
<caution><para>It is imperative at this point to stop and ensure that
the basic functions (compiling and linking) of the adjusted toolchain
are working as expected. To do this, perform a sanity
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2006-01-29 19:53:38 UTC (rev 7313)
+++ trunk/BOOK/general.ent 2006-01-30 01:45:25 UTC (rev 7314)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060126">
-<!ENTITY releasedate "January 26, 2006">
+<!ENTITY version "SVN-20060129">
+<!ENTITY releasedate "January 29, 2006">
<!ENTITY milestone "6.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
