Changeset 7126617 in clfs-sysroot for BOOK/final-system

Timestamp:

May 26, 2006, 8:58:01 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

f6c417f

Parents:

1f0a9c9

Message:

r3664@server (orig r1665): jciccone | 2006-05-26 18:15:08 -0700
Added the posix patches to the final-system binutils and gcc. Changed some sed commands to not use -i and fixed a typo in the gcc instructions.

Location:

BOOK/final-system/common

Files:

• binutils.xml (modified) (1 diff)
• gcc.xml (modified) (4 diffs)

BOOK/final-system/common/binutils.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
+
+    <para os="p1">To make sure that the proper syntax is used for a couple of
+    tools, apply the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
 
     <para os="a">The Binutils documentation recommends building Binutils outside of the

BOOK/final-system/common/gcc.xml

@@ -26 +26 @@
     <title>Installation of GCC</title>
 
-    <para os="p1">The following patch fixes the searching of multilib dirs for
+    <para os="p1">To make sure that a couple of tools use the proper syntax,
+    apply the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../gcc-4.1.1-posix-1.patch</userinput></screen>
+
+    <para os="p3">The following patch fixes the searching of multilib dirs for
     specs file:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
     <para os="a">Apply a <command>sed</command> substitution that will suppress the
@@ -36 +41 @@
     Binutils will be used instead:</para>
 
-<screen os="b"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
+<screen os="b"><userinput>cp libiberty/Makefile.in{,.orig}
+sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig > libiberty/Makefile.in</userinput></screen>
 
     <para os="e1">GCC provides a <command>gccbug</command> script which detects at
@@ -44 +50 @@
     later, so the following sed will simulate its presence:</para>
 
-<screen os="e2"><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>
+<screen os="e2"><userinput>cp gcc/gccbug.in{,.orig}
+sed 's/@have_mktemp_command@/yes/' gcc/gccbug.in.orig > gcc/gccbug.in</userinput></screen>
 
     <para os="c">The GCC documentation recommends building GCC outside of the source
@@ -54 +61 @@
     <para os="e">Prepare GCC for compilation:</para>
 
-<screen os="f"><userinput>../gcc-4.1.0/configure --prefix=/usr --libexecdir=/usr/lib \
+<screen os="f"><userinput>../gcc-&gcc-version;/configure --prefix=/usr --libexecdir=/usr/lib \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \