Changeset d4b5218

Timestamp:

05/15/2021 05:57:13 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

30fb4c0, e04bf44

Parents:

2606939

Message:

Merge

Files:

• chapter05/glibc.xml (modified) (5 diffs)
• chapter08/glibc.xml (modified) (4 diffs)
• stylesheets/patcheslist.xsl (modified) (1 diff)

chapter05/glibc.xml

@@ -84 +84 @@
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      libc_cv_slibdir=/usr/lib           \
-      libc_cv_rtlddir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
       --prefix=/usr                      \
@@ -93 +92 @@
       --with-headers=$LFS/usr/include    \
       --enable-multi-arch                \
-      libc_cv_slibdir=/usr/lib           \
-      libc_cv_rtlddir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -207 +205 @@
     </variablelist>
 
-    <!--
-      The /usr which gets removed from the RTLDLIST by the sed
-      below is set by the libc_cv_rtlddir=/usr/lib above. When
-      changing the libc_cv_rtlddir to /lib, the content of the
-      ldd script does not need to be patched, but some other
-      symlinks created by glibc itself will be not that correct
-      and needs to be fixed by other symlinks.
-
-      First setting /usr and than removing /usr seems strange,
-      but it looks like that libc_cv_rtlddir has more effect than
-      only the pathes in ldd (it has influence on which symlinks
-      to the loader are created where) and makes the handling
-      in a multilib environment much easier.
-      To me, it feels better to go the way with adding/removing
-      /usr than to introduce a symlink hell.
-      
-      Another option to get ldd working properly is to set a
-      symlink as "ln -svf lib /usr/lib64" but it has been reported
-      that we used that already years ago but dropped it since
-      libtool will complain sometimes with "library has been moved"
-      warnings.
-      Don't know if this is still the case - if not, this one
-      symlink seems to be the cleanest way and the sed on ldd will
-      be obsolete.
-    -->
     <para>Fix hardcoded path to the executable loader in
     <command>ldd</command> script:</para>
@@ -308 +281 @@
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
-      libc_cv_slibdir=/usr/lib32           \
-      libc_cv_rtlddir=/usr/lib32</userinput></screen>
+      libc_cv_slibdir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -381 +353 @@
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
-      libc_cv_slibdir=/usr/libx32           \
-      libc_cv_rtlddir=/usr/libx32</userinput></screen>
+      libc_cv_slibdir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>

chapter08/glibc.xml

@@ -73 +73 @@
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
-             libc_cv_slibdir=/usr/lib                 \
-             libc_cv_rtlddir=/usr/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                         \
@@ -81 +80 @@
              --with-headers=/usr/include              \
              --enable-multi-arch                      \
-             libc_cv_slibdir=/usr/lib                 \
-             libc_cv_rtlddir=/usr/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -519 +517 @@
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
-      libc_cv_slibdir=/usr/lib32         \
-      libc_cv_rtlddir=/usr/lib32</userinput></screen>
+      libc_cv_slibdir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -596 +593 @@
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
-      libc_cv_slibdir=/usr/libx32         \
-      libc_cv_rtlddir=/usr/libx32</userinput></screen>
+      libc_cv_slibdir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>

stylesheets/patcheslist.xsl

@@ -39 +39 @@
     <xsl:text>
 if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then
-  mail -s "Missing LFS patches" lfs-book@linuxfromscratch.org &lt; copyerrs
+  mail -s "Missing LFS patches" lfs-book@lists.linuxfromscratch.org &lt; copyerrs
 fi&#x0a;&#x0a;</xsl:text>