diff options
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/chapter05.xml | 1 | ||||
| -rw-r--r-- | chapter05/e2fsprogs.xml | 29 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter05/util-linux-ng.xml | 19 |
4 files changed, 46 insertions, 5 deletions
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 096717c36..c938a72cc 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -29,7 +29,6 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="e2fsprogs.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/> diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml index 43cea7558..7adb6bc07 100644 --- a/chapter05/e2fsprogs.xml +++ b/chapter05/e2fsprogs.xml @@ -48,9 +48,34 @@ <screen><userinput remap="pre">mkdir -v build cd build</userinput></screen> + <para>Fix a bug in E2fsprogs that prevents it from building against Util-Linux-NG's copy of <systemitem class="library">libuuid</systemitem>:</para> + +<screen><userinput remap="pre">cp -v ../MCONFIG.in{,.orig} + sed -e '82 s/LIBUUID/DEPLIBUUID/' ../MCONFIG.in.orig > ../MCONFIG.in</userinput></screen> + <para>Prepare E2fsprogs for compilation:</para> -<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">../configure --prefix=/tools --disable-libblkid --disable-libuuid</userinput></screen> + + <variablelist> + <title>The meaning of the new configure option:</title> + + <varlistentry> + <term><parameter>--disable-libblkid</parameter></term> + <listitem> + <para>This prevents E2fsprogs from building its own copy of the + libblkid library, which Util-Linux-NG provides.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--disable-libuuid</parameter></term> + <listitem> + <para>This prevents E2fsprogs from building its own copy of the + libuuid library, which Util-Linux-NG provides.</para> + </listitem> + </varlistentry> + </variablelist> <para>Compile the package:</para> @@ -64,7 +89,7 @@ cd build</userinput></screen> be removed later:</para> <screen><userinput remap="install">chmod -v u+w \ - /tools/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen> + /tools/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen> </sect2> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index ff31b3b4d..3db93f0d6 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -73,7 +73,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userin <command>sed</command> command to force the build to use the flag:</para> <screen><userinput remap="pre">cp -v gcc/Makefile.in{,.tmp} -sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ +sed 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in</userinput></screen> <para>The following command will change the location of GCC's default diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml index 67b0b9f42..955698e3a 100644 --- a/chapter05/util-linux-ng.xml +++ b/chapter05/util-linux-ng.xml @@ -46,7 +46,19 @@ <para>Prepare Util-linux-ng for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> - +<!-- + <variablelist> + <title>The meaning of the new configure option:</title> + + <varlistentry> + <term><parameter>- -with-fsprobe</parameter></term> + <listitem> + <para>This tells Util-Linux-NG to use its own version of the libblkid + library, rather than a system-installed version.</para> + </listitem> + </varlistentry> + </variablelist> +--> <para>Only a few of the utilities contained in this package need to be built:</para> @@ -65,6 +77,11 @@ make -C text-utils more</userinput></screen> <para>This package does not come with a test suite.</para> + <para>Install the shared libraries required by E2fsprogs:</para> + +<screen><userinput remap="install">make -C shlibs/uuid install +make -C shlibs/blkid install</userinput></screen> + <para>Copy these programs to the temporary tools directory:</para> <screen><userinput remap="install">cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin</userinput></screen> |