Changeset 0ebda11 for chapter08/glibc.xml

Timestamp:

05/14/2021 10:47:43 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

2606939

Parents:

51c01bff

Message:

Remove entities for multilib pathes
Add usage of libc_cv_rtlddir

File:

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

chapter08/glibc.xml

@@ -73 +73 @@
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
-             libc_cv_slibdir=/usr/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib                 \
+             libc_cv_rtlddir=/usr/lib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
@@ -80 +81 @@
              --with-headers=/usr/include              \
              --enable-multi-arch                      \
-             libc_cv_slibdir=/usr/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib                 \
+             libc_cv_rtlddir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -125 +127 @@
           <para>This variable sets the correct library for all
           systems.  We do not want lib64 to be used.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>libc_cv_rtlddir=/usr/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
         </listitem>
       </varlistentry>
@@ -222 +232 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Fix hardcoded path to the executable loader in
+    <command>ldd</command> script:</para>
+
+<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i /usr/bin/ldd</userinput></screen>
 
     <para>Install the configuration file and runtime directory for
@@ -483 +498 @@
 
     <para>Now recompile for m32. The extracted source can be
-    reused but needs to cleaned before installing the m32
+    reused but needs to be cleaned before installing the m32
     version of Glibc.</para>
 
@@ -502 +517 @@
       --with-headers=/usr/include        \
       --enable-multi-arch                \
-      --libdir=&usr-lib-m32;                \
-      --libexecdir=&usr-lib-m32;            \
-      libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
+      --libdir=/usr/lib32                \
+      --libexecdir=/usr/lib32            \
+      libc_cv_slibdir=/usr/lib32         \
+      libc_cv_rtlddir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -513 +529 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-m32;/* &usr-lib-m32;/
+cp -a DESTDIR/usr/lib32/* /usr/lib32/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
-               /usr/include/gnu/
-ln -svf ..&lib-m32;/ld-linux.so.2 /lib/ld-linux.so.2</userinput></screen>
+               /usr/include/gnu/</userinput></screen>
+<!-- no longer required as they are created in chap5
+ln -svf ../lib32/ld-linux.so.2 /lib/ld-linux.so.2
+-->
 
     <para>Add the library name to the dynamic loader config:</para>
 
-<screen role="install"><userinput>echo "&usr-lib-m32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
+<screen role="install"><userinput>echo "/usr/lib32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
 
     <caution>
@@ -557 +575 @@
 
     <para>Now recompile for mx32. The extracted source can be
-    reused but needs to cleaned before installing the mx32
+    reused but needs to be cleaned before installing the mx32
     version of Glibc.</para>
 
@@ -574 +592 @@
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
-      --with-headers=$LFS/usr/include    \
+      --with-headers=/usr/include        \
       --enable-multi-arch                \
-      --libdir=&usr-lib-mx32;               \
-      --libexecdir=&usr-lib-mx32;           \
-      libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
+      --libdir=/usr/libx32               \
+      --libexecdir=/usr/libx32           \
+      libc_cv_slibdir=/usr/libx32         \
+      libc_cv_rtlddir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -587 +606 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;/
+cp -a DESTDIR/usr/libx32/* /usr/libx32/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
-               /usr/include/gnu/
-ln -svf ..&lib-mx32;/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2</userinput></screen>
-
+               /usr/include/gnu/</userinput></screen>
+<!-- no longer required as they are created in chap5
+ln -svf ../libx32/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2
+-->
     <para>Add the library name to the dynamic loader config:</para>
 
-<screen role="install"><userinput>echo "&usr-lib-mx32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
+<screen role="install"><userinput>echo "/usr/libx32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
 
     <caution>