Changeset 1f30432


Ignore:
Timestamp:
08/25/2003 09:41:50 PM (21 years ago)
Author:
Alex Gronenwoud <alex@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v5_0, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
8a0d0eb2
Parents:
b0dbf738
Message:

uniformized text of 'locking' and 'adjusting'

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2677 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • chapter05/lockingglibc.xml

    rb0dbf738 r1f30432  
    33<?dbhtml filename="lockingglibc.html" dir="chapter05"?>
    44
    5 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
     5<para>Now that the temporary C libraries have been installed, we want all
     6the tools compiled in the rest of this chapter to be linked against these
     7libraries. To accomplish this, we need to adjust the linker's scripts and the
     8compiler's specs file.</para>
    69
    7 <sect2>
    8 <title>Installation of the linker scripts</title>
    9 
    10 <para>Run the following command from within the <filename
    11 class="directory">binutils-build</filename> directory:</para>
     10<para>First install the adjusted linker scripts by running the following from
     11within the <filename class="directory">binutils-build</filename>
     12directory:</para>
    1213
    1314<para><screen><userinput>make -C ld install-data-local</userinput></screen></para>
    1415
    15 <para>This installs the adjusted linker scripts. Remember they were adjusted
    16 a little while back, at the end of the first pass of Binutils? The linker
    17 scripts now contain no mention of <filename>/lib</filename>,
     16<para>These scripts were adjusted a little while back, at the end of the first
     17pass of Binutils, and contain no mention of <filename>/lib</filename>,
    1818<filename>/usr/lib</filename> or <filename>/usr/local/lib</filename>.
    1919From this point onwards everything will link <emphasis>only</emphasis>
     
    2222<para>You can now remove Binutils' build and source directories.</para>
    2323
    24 </sect2>
    25 
    26 <sect2>
    27 <title>Amending GCC's specs file</title>
    28 
    29 <para>The final thing to do is to amend our GCC specs file so that it points
     24<para>The other thing to do is to amend our GCC specs file so that it points
    3025to the new dynamic linker. A simple sed will accomplish this:</para>
    3126   
     
    3328sed -e 's@/lib/ld.so.1@/stage1/lib/ld.so.1@g' \
    3429&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' \
    35 &nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > XX
    36 mv XX $SPECFILE
     30&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > tempspecfile
     31mv tempspecfile $SPECFILE
    3732unset SPECFILE</userinput></screen></para>
    3833
     
    4439can now be used to build the rest of the temporary tools.</para>
    4540
    46 </sect2>
    47 
    4841</sect1>
    4942
  • chapter06/adjustingtoolchain.xml

    rb0dbf738 r1f30432  
    11<sect1 id="ch06-adjustingtoolchain">
    2 <title>Adjusting toolchain</title>
     2<title>Re-adjusting the toolchain</title>
    33<?dbhtml filename="adjustingtoolchain.html" dir="chapter06"?>
    44
    5 <para>Now that we have compiled all the necessary tools, it is time to
    6 re-adjust our toolchain. We will set it up so that it will link any newly
    7 compiled program against the new Glibc. Basically, this is the reverse of
    8 what we did in the "Locking in" stage in the beginning of chapter 5.</para>
     5<para>Now that the new C libraries have been installed, it's time to re-adjust
     6our toolchain. We'll adjust it so that it will link any newly compiled program
     7against the new C libraries. Basically, this is the reverse of what we did
     8in the "Locking in" stage in the beginning of the previous chapter.</para>
    99
    1010<para>The first thing to do is to adjust the linker scripts. For this we
    11 retained the <filename class="directory">binutils-build</filename>
    12 directory from the second pass over Binutils. Run the following:</para>
     11retained the source and build directories from the second pass over Binutils.
     12Install the adjusted linker scripts by running the following from within the
     13<filename class="directory">binutils-build</filename> directory:</para>
    1314
    14 <para><screen><userinput>cd binutils-build
    15 make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
     15<para><screen><userinput>make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
    1616
    17 <para>This installs the adjusted linker scripts. The linker scripts contain
     17<para>The linker scripts now contain
    1818no mention of <filename class="directory">/stage1/lib</filename> anymore.
    1919From now on every compiled program will link <emphasis>only</emphasis>
     
    3333<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs
    3434sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
    35 &nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE > XX
    36 mv XX $SPECFILE
     35&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g'
     36&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile
     37mv newspecfile $SPECFILE
    3738unset SPECFILE</userinput></screen></para>
    3839
    3940<para>Again, cutting and pasting the above is recommended. And just like
    40 before, it is a good idea to check the linker scripts and the specs file o
     41before, it is a good idea to check the linker scripts and the specs file to
    4142ensure the intended changes were actually made.</para>
    4243
Note: See TracChangeset for help on using the changeset viewer.