Changeset d4b5218


Ignore:
Timestamp:
05/15/2021 05:57:13 AM (7 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
30fb4c0, e04bf44
Parents:
2606939
Message:

Merge

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter05/glibc.xml

    r2606939 rd4b5218  
    8484      --enable-kernel=&min-kernel;                \
    8585      --with-headers=$LFS/usr/include    \
    86       libc_cv_slibdir=/usr/lib           \
    87       libc_cv_rtlddir=/usr/lib</userinput></screen>
     86      libc_cv_slibdir=/usr/lib</userinput></screen>
    8887<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
    8988      --prefix=/usr                      \
     
    9392      --with-headers=$LFS/usr/include    \
    9493      --enable-multi-arch                \
    95       libc_cv_slibdir=/usr/lib           \
    96       libc_cv_rtlddir=/usr/lib</userinput></screen>
     94      libc_cv_slibdir=/usr/lib</userinput></screen>
    9795
    9896    <variablelist>
     
    207205    </variablelist>
    208206
    209     <!--
    210       The /usr which gets removed from the RTLDLIST by the sed
    211       below is set by the libc_cv_rtlddir=/usr/lib above. When
    212       changing the libc_cv_rtlddir to /lib, the content of the
    213       ldd script does not need to be patched, but some other
    214       symlinks created by glibc itself will be not that correct
    215       and needs to be fixed by other symlinks.
    216 
    217       First setting /usr and than removing /usr seems strange,
    218       but it looks like that libc_cv_rtlddir has more effect than
    219       only the pathes in ldd (it has influence on which symlinks
    220       to the loader are created where) and makes the handling
    221       in a multilib environment much easier.
    222       To me, it feels better to go the way with adding/removing
    223       /usr than to introduce a symlink hell.
    224      
    225       Another option to get ldd working properly is to set a
    226       symlink as "ln -svf lib /usr/lib64" but it has been reported
    227       that we used that already years ago but dropped it since
    228       libtool will complain sometimes with "library has been moved"
    229       warnings.
    230       Don't know if this is still the case - if not, this one
    231       symlink seems to be the cleanest way and the sed on ldd will
    232       be obsolete.
    233     -->
    234207    <para>Fix hardcoded path to the executable loader in
    235208    <command>ldd</command> script:</para>
     
    308281      --libdir=/usr/lib32                \
    309282      --libexecdir=/usr/lib32            \
    310       libc_cv_slibdir=/usr/lib32           \
    311       libc_cv_rtlddir=/usr/lib32</userinput></screen>
     283      libc_cv_slibdir=/usr/lib32</userinput></screen>
    312284
    313285    <para>Compile the package:</para>
     
    381353      --libdir=/usr/libx32               \
    382354      --libexecdir=/usr/libx32           \
    383       libc_cv_slibdir=/usr/libx32           \
    384       libc_cv_rtlddir=/usr/libx32</userinput></screen>
     355      libc_cv_slibdir=/usr/libx32</userinput></screen>
    385356
    386357    <para>Compile the package:</para>
  • chapter08/glibc.xml

    r2606939 rd4b5218  
    7373             --enable-stack-protector=strong          \
    7474             --with-headers=/usr/include              \
    75              libc_cv_slibdir=/usr/lib                 \
    76              libc_cv_rtlddir=/usr/lib</userinput></screen>
     75             libc_cv_slibdir=/usr/lib</userinput></screen>
    7776<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr                            \
    7877             --disable-werror                         \
     
    8180             --with-headers=/usr/include              \
    8281             --enable-multi-arch                      \
    83              libc_cv_slibdir=/usr/lib                 \
    84              libc_cv_rtlddir=/usr/lib</userinput></screen>
     82             libc_cv_slibdir=/usr/lib</userinput></screen>
    8583
    8684    <variablelist>
     
    519517      --libdir=/usr/lib32                \
    520518      --libexecdir=/usr/lib32            \
    521       libc_cv_slibdir=/usr/lib32         \
    522       libc_cv_rtlddir=/usr/lib32</userinput></screen>
     519      libc_cv_slibdir=/usr/lib32</userinput></screen>
    523520
    524521    <para>Compile the package:</para>
     
    596593      --libdir=/usr/libx32               \
    597594      --libexecdir=/usr/libx32           \
    598       libc_cv_slibdir=/usr/libx32         \
    599       libc_cv_rtlddir=/usr/libx32</userinput></screen>
     595      libc_cv_slibdir=/usr/libx32</userinput></screen>
    600596
    601597    <para>Compile the package:</para>
  • stylesheets/patcheslist.xsl

    r2606939 rd4b5218  
    3939    <xsl:text>
    4040if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then
    41   mail -s "Missing LFS patches" lfs-book@linuxfromscratch.org &lt; copyerrs
     41  mail -s "Missing LFS patches" lfs-book@lists.linuxfromscratch.org &lt; copyerrs
    4242fi&#x0a;&#x0a;</xsl:text>
    4343
Note: See TracChangeset for help on using the changeset viewer.