Changeset f5c3bf6

Timestamp:

05/13/2021 04:30:55 PM (23 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

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, arm, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack

Children:

1b1acbed

Parents:

8725cae

Message:

Use a configuration option to set the loader pathes in ldd

Files:

• chapter05/glibc.xml (modified) (3 diffs)
• chapter08/glibc.xml (modified) (3 diffs)

chapter05/glibc.xml

@@ -81 +81 @@
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      libc_cv_slibdir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib           \
+      libc_cv_rtlddir=/lib</userinput></screen>
 
     <variablelist>
@@ -119 +120 @@
           <para>This ensures that the library is installed in /usr/lib instead
           of the default /lib64 on 64 bit machines.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>libc_cv_rtlddir=/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
         </listitem>
       </varlistentry>
@@ -185 +194 @@
 
     </variablelist>
-
+<!--
     <para>Fix hardcoded path to the executable loader in
     <command>ldd</command> script:</para>
 
 <screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
-
+-->
     <caution>
       <para>At this point, it is imperative to stop and ensure that the basic

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=/lib</userinput></screen>
 
     <variablelist>
@@ -118 +119 @@
           <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=/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
         </listitem>
       </varlistentry>
@@ -215 +224 @@
 
 <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
     <command>nscd</command>:</para>