diff options
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/diffutils-exp.xml | 13 | ||||
| -rw-r--r-- | chapter05/diffutils-inst.xml | 32 | ||||
| -rw-r--r-- | chapter05/diffutils.xml | 5 | ||||
| -rw-r--r-- | chapter05/fileutils-exp.xml | 10 | ||||
| -rw-r--r-- | chapter05/fileutils-inst.xml | 13 | ||||
| -rw-r--r-- | chapter05/fileutils.xml | 5 |
6 files changed, 40 insertions, 38 deletions
diff --git a/chapter05/diffutils-exp.xml b/chapter05/diffutils-exp.xml deleted file mode 100644 index 4dc40ea07..000000000 --- a/chapter05/diffutils-exp.xml +++ /dev/null @@ -1,13 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> The -CPPFLAGS variable is a variable that's read by the cpp program (C -PreProcessor). The value of this variable tells the preprocessor to -replace every instance of re_max_failures it finds by re_max_failures2 -before handing the source file to the compiler itself for compilation. This -package has problems linking statically on systems that run an older -Glibc version and this construction fixes that problem.</para> - -</sect2> - diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index cb387de49..e197fa674 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -1,11 +1,37 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Diffutils</title> -<para>Install Diffutils by running the following commands:</para> +<para>Prepare Diffutils to be compiled:</para> <para><screen><userinput>LDFLAGS="-static" CPPFLAGS=-Dre_max_failures=re_max_failures2 \ - ./configure --prefix=$LFS/static --disable-nls && -make && + ./configure --prefix=$LFS/static --disable-nls</userinput></screen></para> + +<para>The meaning of the configure options are:</para> + +<itemizedlist> +<listitem><para><userinput>LDFLAGS="-static":</userinput> This is the most +common way to tell a package that all programs should be statically linked. +This way the <emphasis>LDFLAGS</emphasis> environment variable is set but +only in the subshell that the <filename>configure</filename> script runs +in. When <userinput>configure</userinput> is done its job, the +<emphasis>LDFLAGS</emphasis> variable won't exist +anymore.</para></listitem> + +<listitem><para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> +The <emphasis>CPPFLAGS</emphasis> variable is a variable that's read by the +cpp program (C PreProcessor). The value of this variable tells the +preprocessor to replace every instance of <emphasis>re_max_failures</emphasis> +it finds with <emphasis>re_max_failures2</emphasis> before handing the source +file to the compiler itself for compilation. This package has problems +linking statically on systems that run an older Glibc version and this +construction fixes that problem.</para></listitem> +</itemizedlist> + +<para>Finish off by compiling and installing the package:</para> + +<para><screen><userinput>make make install</userinput></screen></para> </sect2> diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index 7e7411247..3156c340c 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &diffutils-time-static; Estimated required disk space: &diffutils-compsize-static;</screen> -&c5-diffutils-inst; -&c5-diffutils-exp; -&aa-diffutils-desc; +&aa-diffutils-shortdesc; &aa-diffutils-dep; +&c5-diffutils-inst; </sect1> diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml deleted file mode 100644 index ec4647069..000000000 --- a/chapter05/fileutils-exp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch:</userinput> This is used to fix a problem with building fileutils statically on -glibc 2.2.3 systems. If this isn't done, then there is the possibility of -all of the fileutils programs causing segmentation faults once chroot is -entered in Chapter 6.</para> - -</sect2> - diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index a37c01261..7e6275aeb 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Fileutils</title> @@ -17,7 +19,7 @@ your distribution has altered Glibc-2.2.3 somehow, but details are unavailable at this time.</para> <para>To fix this package to compile properly on AMD/Glibc-2.2.3 -machines, run the following command. Do <emphasis>not</emphasis> +machines, run the following command. Do <emphasis>NOT</emphasis> attempt this fix if you don't have Glibc-2.2.3 installed. It will more than likely result in all kinds of compile time problems.</para> @@ -26,16 +28,15 @@ than likely result in all kinds of compile time problems.</para> <para>Install Fileutils by running the following commands:</para> <para><screen><userinput>LDFLAGS="-static" \ - ./configure --disable-nls --prefix=$LFS/static && -make && + ./configure --disable-nls --prefix=$LFS/static +make make install</userinput></screen></para> <para>Once you have installed Fileutils, you can test whether the segmentation fault problem has been avoided by running <userinput>$LFS/static/bin/ls</userinput>. If this works, then you are OK. If -not, then you need to re-do the installation with the patch if -you didn't use it, or without the patch if you did use -it.</para> +not, then you need to re-do the installation with the patch if you didn't +use it, or without the patch if you did use it.</para> </sect2> diff --git a/chapter05/fileutils.xml b/chapter05/fileutils.xml index cccbe9dc9..19cbd8cd7 100644 --- a/chapter05/fileutils.xml +++ b/chapter05/fileutils.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &fileutils-time-static; Estimated required disk space: &fileutils-compsize-static;</screen> -&c5-fileutils-inst; -&c5-fileutils-exp; -&aa-fileutils-desc; +&aa-fileutils-shortdesc; &aa-fileutils-dep; +&c5-fileutils-inst; </sect1> |