aboutsummaryrefslogtreecommitdiffstats
path: root/chapter08/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 /chapter08/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 'chapter08/glibc.xml')
-rw-r--r--chapter08/glibc.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 7fc661dc2..3b51906b5 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -55,6 +55,10 @@
<screen><userinput remap="pre">sed -e '402a\ *result = local->data.services[database_index];' \
-i nss/nss_database.c</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>
@@ -68,7 +72,7 @@ cd build</userinput></screen>
--enable-kernel=&min-kernel; \
--enable-stack-protector=strong \
--with-headers=/usr/include \
- libc_cv_slibdir=/lib</userinput></screen>
+ libc_cv_slibdir=/usr/lib</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -109,7 +113,7 @@ 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 variable sets the correct library for all
systems. We do not want lib64 to be used.</para>
@@ -221,7 +225,7 @@ mkdir -pv /var/cache/nscd</userinput></screen>
<command>nscd</command>:</para>
<screen revision="systemd"><userinput remap="install">install -v -Dm644 ../nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
-install -v -Dm644 ../nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
+install -v -Dm644 ../nscd/nscd.service /usr/lib/systemd/system/nscd.service</userinput></screen>
<para>Next, install the locales that can make the system respond in a
different language. None of the locales are required, but if some of them