Changeset d7a9421 for chapter08/glibc.xml

Timestamp:

05/12/2021 04:24:11 AM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

5ed37b3, c034573, df462a9

Parents:

0f7d4cb

Message:

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!

File:

• chapter08/glibc.xml (modified) (4 diffs)

chapter08/glibc.xml

@@ -56 +56 @@
     -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>
@@ -69 +73 @@
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
-             libc_cv_slibdir=/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -110 +114 @@
 
       <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
@@ -222 +226 @@
 
     <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