aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/glibc.xml
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06/glibc.xml')
-rw-r--r--chapter06/glibc.xml26
1 files changed, 13 insertions, 13 deletions
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index aaa4b71d5..9e4b77826 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -67,7 +67,7 @@
<ulink url="&blfs-root;view/svn/general/libidn.html"/>).
Unpack the tarball from within the Glibc source directory:</para>
-<screen><userinput>tar -xvf ../glibc-libidn-&glibc-version;.tar.gz
+<screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.gz
mv glibc-libidn-&glibc-version; libidn</userinput></screen>
<para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
@@ -75,7 +75,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
Glibc problem. Disable installation of this locale in order to avoid the
problem:</para>
-<screen><userinput>sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
+<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
<para>When running <command>make install</command>, a script called
<filename>test-installation.pl</filename> performs a small sanity test on
@@ -84,7 +84,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
test would be carried out against the wrong Glibc. We can force the script
to check the Glibc we have just installed with the following:</para>
-<screen><userinput>sed -i \
+<screen><userinput remap="pre">sed -i \
's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
scripts/test-installation.pl</userinput></screen>
@@ -94,21 +94,21 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
<ulink url="&blfs-root;view/svn/postlfs/shells.html">Shells</ulink>
chapter of the BLFS book:</para>
-<screen><userinput>sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
+<screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
-<screen><userinput>mkdir -v ../glibc-build
+<screen><userinput remap="pre">mkdir -v ../glibc-build
cd ../glibc-build</userinput></screen>
<para>Again, add the needed compiler flag to CFLAGS:</para>
-<screen><userinput>echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
+<screen><userinput remap="configure">echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
<para>Prepare Glibc for compilation:</para>
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \
--disable-profile --enable-add-ons \
--enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc</userinput></screen>
@@ -129,7 +129,7 @@ cd ../glibc-build</userinput></screen>
<para>Compile the package:</para>
-<screen><userinput>make</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
<important>
<para>In this section, the test suite for Glibc is considered critical.
@@ -138,7 +138,7 @@ cd ../glibc-build</userinput></screen>
<para>Test the results:</para>
-<screen><userinput>make -k check 2&gt;&amp;1 | tee glibc-check-log
+<screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
grep Error glibc-check-log</userinput></screen>
<para>You will probably see an expected (ignored) failure in the
@@ -180,11 +180,11 @@ grep Error glibc-check-log</userinput></screen>
complain about the absence of <filename>/etc/ld.so.conf</filename>.
Prevent this warning with:</para>
-<screen><userinput>touch /etc/ld.so.conf</userinput></screen>
+<screen><userinput remap="install">touch /etc/ld.so.conf</userinput></screen>
<para>Install the package:</para>
-<screen><userinput>make install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
<para>The locales that can make the system respond in a different language
were not installed by the above command. None of the locales are required,
@@ -202,7 +202,7 @@ grep Error glibc-check-log</userinput></screen>
The following instructions will install the minimum set of
locales necessary for the optimal coverage of tests:</para>
-<screen role="nodump"><userinput>mkdir -pv /usr/lib/locale
+<screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale
localedef -i de_DE -f ISO-8859-1 de_DE
localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
localedef -i en_HK -f ISO-8859-1 en_HK
@@ -225,7 +225,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
(it includes every locale listed above and many more) at once with the
following time-consuming command:</para>
-<screen><userinput>make localedata/install-locales</userinput></screen>
+<screen><userinput remap="locale-full">make localedata/install-locales</userinput></screen>
<para>Then use the <command>localedef</command> command to create and
install locales not listed in the