Changeset df462a9 for chapter05

Timestamp:

05/12/2021 05:26:46 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

3de7f52

Parents:

0e9fb93 (diff), d7a9421 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pre-LFS-11-0 changes

File:

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

chapter05/glibc.xml

@@ -59 +59 @@
 ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</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
@@ -74 +65 @@
 
 <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 
@@ -89 +84 @@
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      libc_cv_slibdir=/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
       --prefix=/usr                      \
@@ -97 +92 @@
       --with-headers=$LFS/usr/include    \
       --enable-multi-arch                \
-      --libdir=/usr/lib                  \
-      --libexecdir=/usr/lib              \
-      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>
@@ -136 +126 @@
 
       <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>
@@ -278 +268 @@
       --libdir=&usr-lib-m32;                \
       --libexecdir=&usr-lib-m32;            \
-      libc_cv_slibdir=&lib-m32;</userinput></screen>
+      libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -350 +340 @@
       --libdir=&usr-lib-mx32;               \
       --libexecdir=&usr-lib-mx32;           \
-      libc_cv_slibdir=&lib-mx32;</userinput></screen>
+      libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
 
     <para>Compile the package:</para>