Changeset f5c3bf6


Ignore:
Timestamp:
05/13/2021 04:30:55 PM (5 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, ml-11.0, multilib, trunk, xry111/glibc-2.34, xry111/tester-nohack
Children:
1b1acbed
Parents:
8725cae
Message:

Use a configuration option to set the loader pathes in ldd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • chapter05/glibc.xml

    r8725cae rf5c3bf6  
    8181      --enable-kernel=&min-kernel;                \
    8282      --with-headers=$LFS/usr/include    \
    83       libc_cv_slibdir=/usr/lib</userinput></screen>
     83      libc_cv_slibdir=/usr/lib           \
     84      libc_cv_rtlddir=/lib</userinput></screen>
    8485
    8586    <variablelist>
     
    119120          <para>This ensures that the library is installed in /usr/lib instead
    120121          of the default /lib64 on 64 bit machines.</para>
     122        </listitem>
     123      </varlistentry>
     124
     125      <varlistentry>
     126        <term><parameter>libc_cv_rtlddir=/lib</parameter></term>
     127        <listitem>
     128          <para>Fix hardcoded path to the executable loader in the
     129            <command>ldd</command> script.</para>
    121130        </listitem>
    122131      </varlistentry>
     
    185194
    186195    </variablelist>
    187 
     196<!--
    188197    <para>Fix hardcoded path to the executable loader in
    189198    <command>ldd</command> script:</para>
    190199
    191200<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
    192 
     201-->
    193202    <caution>
    194203      <para>At this point, it is imperative to stop and ensure that the basic
  • chapter08/glibc.xml

    r8725cae rf5c3bf6  
    7373             --enable-stack-protector=strong          \
    7474             --with-headers=/usr/include              \
    75              libc_cv_slibdir=/usr/lib</userinput></screen>
     75             libc_cv_slibdir=/usr/lib                 \
     76             libc_cv_rtlddir=/lib</userinput></screen>
    7677
    7778    <variablelist>
     
    118119          <para>This variable sets the correct library for all
    119120          systems.  We do not want lib64 to be used.</para>
     121        </listitem>
     122      </varlistentry>
     123
     124      <varlistentry>
     125        <term><parameter>libc_cv_rtlddir=/lib</parameter></term>
     126        <listitem>
     127          <para>Fix hardcoded path to the executable loader in the
     128            <command>ldd</command> script.</para>
    120129        </listitem>
    121130      </varlistentry>
     
    215224
    216225<screen><userinput remap="install">make install</userinput></screen>
    217 
     226<!--
    218227    <para>Fix hardcoded path to the executable loader in
    219228    <command>ldd</command> script:</para>
    220229
    221230<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i /usr/bin/ldd</userinput></screen>
    222 
     231-->
    223232    <para>Install the configuration file and runtime directory for
    224233    <command>nscd</command>:</para>
Note: See TracChangeset for help on using the changeset viewer.