diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-02-01 18:17:30 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-02-01 18:17:30 +0000 |
| commit | 3380af360706c0e79b3476fd395d1e83cb21acee (patch) | |
| tree | 5fe9f7ae444d5036a0a35abf22223d290249d7d6 | |
| parent | e3f07935fcd137b019ee81e3d127947d341ce7d6 (diff) | |
Clarify (again) the extraction order in GCC Pass 1
Reformat Kmod configure command.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9724 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 13 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 6 | ||||
| -rw-r--r-- | chapter05/generalinstructions.xml | 2 | ||||
| -rw-r--r-- | chapter06/kmod.xml | 10 | ||||
| -rw-r--r-- | general.ent | 4 |
5 files changed, 28 insertions, 7 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5fb3ea90d..e0c67813d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -38,6 +38,19 @@ --> <listitem> + <para>2012-02-01</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Clarify (again) the extraction order + in GCC Pass 1.</para> + </listitem> + <listitem> + <para>[bdubbs] - Reformat Kmod configure command.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-01-30</para> <itemizedlist> <listitem> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 63865d36e..31703a184 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -49,6 +49,12 @@ resulting directories so the GCC build procedures will automatically use them:</para> + <note><para>There are frequent misunderstandings about this chapter. The + procedures are the same as every other chapter as explained earlier (<xref + linkend='buildinstr'/>). First extract the gcc tarball from the sources + directory and then change to the directory created. Only then should you + proceed with the instructions below.</para></note> + <screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2 mv -v mpfr-&mpfr-version; mpfr tar -Jxf ../gmp-&gmp-version;.tar.xz diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml index 58f32c45e..ba632c0ee 100644 --- a/chapter05/generalinstructions.xml +++ b/chapter05/generalinstructions.xml @@ -69,7 +69,7 @@ <listitem> <para>Change to the sources directory.</para> </listitem> - <listitem> + <listitem id='buildinstr' xreflabel='Package build instructions'> <para>For each package:</para> <orderedlist numeration="loweralpha" spacing="compact"> <listitem> diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 74c650754..e2066bae3 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -43,10 +43,12 @@ <para>Prepare Kmod for compilation:</para> -<screen><userinput remap="configure">liblzma_CFLAGS="-I/usr/include" liblzma_LIBS="-L/lib -llzma" \ - zlib_CFLAGS="-I/usr/include" zlib_LIBS="-L/lib -lz" ./configure \ - --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc --with-xz \ - --with-zlib</userinput></screen> +<screen><userinput remap="configure">liblzma_CFLAGS="-I/usr/include" \ +liblzma_LIBS="-L/lib -llzma" \ +zlib_CFLAGS="-I/usr/include" \ +zlib_LIBS="-L/lib -lz" \ +./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc \ + --with-xz --with-zlib</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/general.ent b/general.ent index f7bf30845..0167df282 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20120130"> -<!ENTITY releasedate "Jan 30, 2012"> +<!ENTITY version "SVN-20120201"> +<!ENTITY releasedate "Feb 1, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.1"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |