aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05/glibc.xml
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2021-05-11 23:24:11 -0500
committerDouglas R. Reno <renodr@linuxfromscratch.org>2021-05-11 23:24:11 -0500
commitd7a942197e713339d4dc1eedab4dafd4179a5cd8 (patch)
tree48aba90323070adb9a54e83ce1ebed902d0b19c3 /chapter05/glibc.xml
parent0f7d4cb8a734227ea85f46c5b934ed1b85a51b3c (diff)
Merge Xi's changes into trunk
Update to meson-0.58.0 Update to systemd-248 Update to gcc-11.1.0 Update to linux-5.12.1 Update to iproute2-5.12.0 Update to Python-3.9.5 Make /bin, /sbin, and /lib symlinks to their counterparts in /usr. Thanks again for a significant portion of this work goes to Xi, I only really merged it and made a couple of modifications for my updates. To LFS 11.x we go!
Diffstat (limited to 'chapter05/glibc.xml')
-rw-r--r--chapter05/glibc.xml22
1 files changed, 7 insertions, 15 deletions
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 232a6868b..fdd7ef346 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -55,15 +55,6 @@
;;
esac</userinput></screen>
- <note>
- <para>
- The above command is correct. The <command>ln</command> command has
- a few syntactic versions, so be sure to check
- <command>info coreutils ln</command> and <filename>ln(1)</filename>
- before reporting what you may think is an error.
- </para>
- </note>
-
<para>Some of the Glibc programs use the non-FHS compliant
<filename class="directory">/var/db</filename> directory to store their
runtime data. Apply the following patch to make such programs store their
@@ -71,6 +62,10 @@ esac</userinput></screen>
<screen><userinput remap="pre">patch -Np1 -i ../glibc-&glibc-version;-fhs-1.patch</userinput></screen>
+ <para>Fix a build issue with gcc-11.1:</para>
+
+<screen><userinput remap="pre">sed 's/amx_/amx-/' -i sysdeps/x86/tst-cpu-features-supports.c</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc
in a dedicated build directory:</para>
@@ -85,10 +80,7 @@ cd build</userinput></screen>
--build=$(../scripts/config.guess) \
--enable-kernel=&min-kernel; \
--with-headers=$LFS/usr/include \
- libc_cv_slibdir=/lib</userinput></screen>
-<!--
- libc_cv_forced_unwind=yes \
- libc_cv_c_cleanup=yes</userinput></screen> -->
+ libc_cv_slibdir=/usr/lib</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -122,9 +114,9 @@ cd build</userinput></screen>
</varlistentry>
<varlistentry>
- <term><parameter>libc_cv_slibdir=/lib</parameter></term>
+ <term><parameter>libc_cv_slibdir=/usr/lib</parameter></term>
<listitem>
- <para>This ensures that the library is installed in /lib instead
+ <para>This ensures that the library is installed in /usr/lib instead
of the default /lib64 on 64 bit machines.</para>
</listitem>
</varlistentry>