Changeset d7a9421 for chapter05/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:

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

chapter05/glibc.xml

@@ -56 +56 @@
 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
@@ -71 +62 @@
 
 <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 
@@ -86 +81 @@
       --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>
@@ -123 +115 @@
 
       <varlistentry>
-        <term><parameter>libc_cv_slibdir=/lib</parameter></term>
-        <listitem>
-          <para>This ensures that the library is installed in /lib instead
+        <term><parameter>libc_cv_slibdir=/usr/lib</parameter></term>
+        <listitem>
+          <para>This ensures that the library is installed in /usr/lib instead
           of the default /lib64 on 64 bit machines.</para>
         </listitem>