gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues from the merge of the jh branch.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9834 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Ken Moffat 2012-04-26 19:34:20 +00:00
parent cd3c10ceb4
commit d38ac3a291
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chapter01/changelog.xml
View File

@ -36,6 +36,15 @@
</listitem> </listitem>
--> -->
<listitem>
<para>2012-04-26</para>
<itemizedlist>
<listitem>
<para>[ken] - tidy some minor issues from the merge.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2012-04-25</para> <para>2012-04-25</para>

2
chapter05/binutils-pass2.xml
View File

@ -67,7 +67,7 @@ RANLIB=$LFS_TGT-ranlib \
<title>The meaning of the new configure options:</title> <title>The meaning of the new configure options:</title>
<varlistentry> <varlistentry>
<term><parameter>CC="$LFS_TGT-gcc" AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib</parameter></term> <term><parameter>CC=$LFS_TGT-gcc AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib</parameter></term>
<listitem> <listitem>
<para>Because this is really a native build of Binutils, setting these <para>Because this is really a native build of Binutils, setting these
variables ensures that the build system uses the cross-compiler and variables ensures that the build system uses the cross-compiler and

2
chapter05/gcc-pass2.xml
View File

@ -120,7 +120,7 @@ cd ../gcc-build</userinput></screen>
<para>Now prepare GCC for compilation:</para> <para>Now prepare GCC for compilation:</para>
<screen><userinput remap="configure">CC="$LFS_TGT-gcc" \ <screen><userinput remap="configure">CC=$LFS_TGT-gcc \
AR=$LFS_TGT-ar \ AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \ RANLIB=$LFS_TGT-ranlib \
../gcc-&gcc-version;/configure \ ../gcc-&gcc-version;/configure \

18
chapter06/adjusting.xml
View File

@ -5,22 +5,14 @@
%general-entities; %general-entities;
]> ]>
<sect1 id="ch-system-readjusting"> <sect1 id="ch-system-adjusting">
<?dbhtml filename="readjusting.html"?> <?dbhtml filename="adjusting.html"?>
<title>Re-adjusting the Toolchain</title> <title>Adjusting the Toolchain</title>
<para>Now that the final C libraries have been installed, it is time to adjust <para>Now that the final C libraries have been installed, it is time to adjust
the toolchain again. The toolchain will be adjusted so that it will link any the toolchain so that it will link any
newly compiled program against these new libraries. This is a similar process newly compiled program against these new libraries.</para>
used in the <quote>Adjusting</quote> phase in the beginning of <xref
linkend="chapter-temporary-tools"/>, but with the adjustments reversed. In <xref
linkend="chapter-temporary-tools"/>, the chain was guided from the host's
<filename class="directory">/{,usr/}lib</filename> directories to the new
<filename class="directory">/tools/lib</filename> directory. Now, the chain will
be guided from that same <filename class="directory">/tools/lib</filename>
directory to the LFS <filename class="directory">/{,usr/}lib</filename>
directories.</para>
<para>First, backup the <filename class="directory">/tools</filename> linker, <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 and replace it with the adjusted linker we made in chapter 5. We'll also create

4
general.ent
View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-20120425"> <!ENTITY version "SVN-20120426">
<!ENTITY releasedate "Apr 25, 2012"> <!ENTITY releasedate "Apr 26, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2"> <!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->