Changeset df462a9 for chapter08/glibc.xml

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:

• chapter08/glibc.xml (modified) (6 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>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
@@ -76 +80 @@
              --with-headers=/usr/include              \
              --enable-multi-arch                      \
-             libc_cv_slibdir=/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -117 +121 @@
 
       <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
@@ -229 +233 @@
 
     <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
@@ -500 +504 @@
       --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>