Changeset 37e35d2 for chapter05/binutils-pass1.xml

Timestamp:

06/29/2020 07:55:01 AM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

c4804e8

Parents:

d4fdde6

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/binutils-pass1.xml (modified) (9 diffs)

chapter05/binutils-pass1.xml

@@ -26 +26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/binutils.xml"
+    href="../chapter08/binutils.xml"
     xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
@@ -34 +34 @@
 
       <seglistitem>
-        <seg>&binutils-ch5p1-sbu;</seg>
-        <seg>&binutils-ch5p1-du;</seg>
+        <seg>&binutils-tmpp1-sbu;</seg>
+        <seg>&binutils-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -44 +44 @@
     <title>Installation of Cross Binutils</title>
 
-    <note><para>Go back and re-read the notes in the previous section.
-    Understanding the notes labeled important will save you a lot
+    <note><para>Go back and re-read the notes in the section titled <xref
+    linkend="ch-tools-generalinstructions"/>.
+    Understanding the notes labeled important can save you a lot
     of problems later.</para></note>
 
@@ -64 +65 @@
       the configuration, up to and including the first install. To achieve
       this easily, wrap the commands in a <command>time</command>
-      command like this: <userinput>time { ./configure ... &amp;&amp; ...
+      command like this: <userinput>time { ./configure ... &amp;&amp; make
       &amp;&amp; make install; }</userinput>.</para>
     </note>
 
-    <note><para>The approximate build SBU values and required disk space
-    in Chapter&nbsp;5 does not include test suite data.</para></note>
-
     <para>Now prepare Binutils for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">../configure --prefix=/tools            \
+<screen arch="default"><userinput remap="configure">../configure --prefix=$LFS/tools       \
              --with-sysroot=$LFS        \
-             --with-lib-path=/tools/lib \
              --target=$LFS_TGT          \
              --disable-nls              \
              --disable-werror</userinput></screen>
-
-    <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
-<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
-<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
-<userinput remap="configure">../configure --prefix=/tools \
-             --with-sysroot=$LFS                     \
-             --with-lib-path=$lpath                  \
-             --target=$LFS_TGT                       \
-             --disable-nls                           \
-             --disable-werror                        \
-             --enable-64-bit-bfd                     \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=$LFS/tools       \
+             --with-sysroot=$LFS        \
+             --target=$LFS_TGT          \
+             --disable-nls              \
+             --disable-werror           \
              --enable-multilib</userinput></screen>
 
@@ -96 +87 @@
 
       <varlistentry>
-        <term><parameter>--prefix=/tools</parameter></term>
+        <term><parameter>--prefix=$LFS/tools</parameter></term>
         <listitem>
           <para>This tells the configure script to prepare to install the
-          Binutils programs in the <filename class="directory">/tools</filename>
-          directory.</para>
+          binutils programs in the <filename
+          class="directory">$LFS/tools</filename> directory.</para>
         </listitem>
       </varlistentry>
@@ -113 +104 @@
 
       <varlistentry>
-        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-        <listitem>
-          <para>This specifies which library path the linker should be
-          configured to use.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><envar>--target=$LFS_TGT</envar></term>
         <listitem>
@@ -126 +109 @@
           variable is slightly different than the value returned by the
           <command>config.guess</command> script, this switch will tell the
-          <command>configure</command> script to adjust Binutil's build system
+          <command>configure</command> script to adjust binutil's build system
           for building a cross linker.  </para>
         </listitem>
@@ -147 +130 @@
       </varlistentry>
 
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--enable-multilib</parameter></term>
+        <listitem>
+          <para>Enables multilib support.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
@@ -152 +142 @@
 
 <screen><userinput remap="make">make</userinput></screen>
-
-    <para>Compilation is now complete. Ordinarily we would now run the
-    test suite, but at this early stage the test suite framework (Tcl,
-    Expect, and DejaGNU) is not yet in place. The benefits of running the
-    tests at this point are minimal since the programs from this
-    first pass will soon be replaced by those from the second.</para>
-
-    <para arch="default">If building on x86_64, create a symlink to ensure the
-    sanity of the toolchain:</para>
-
-    <para arch="ml_32,ml_x32,ml_all">Create a symlink to ensure the sanity of
-    the toolchain:</para>
-
-<screen arch="default"><userinput remap="install">case $(uname -m) in
-  x86_64) mkdir -v /tools/lib &amp;&amp; ln -sv lib /tools/lib64 ;;
-esac</userinput></screen>
-
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="install">mkdir -v /tools/lib &amp;&amp;
-ln -sv lib /tools/lib64</userinput></screen>
 
     <para>Install the package:</para>