Changeset d4b5218
- Timestamp:
- 05/15/2021 05:57:13 AM (3 years ago)
- Branches:
- ml-11.0, multilib
- Children:
- 30fb4c0, e04bf44
- Parents:
- 2606939
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
chapter05/glibc.xml
r2606939 rd4b5218 84 84 --enable-kernel=&min-kernel; \ 85 85 --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> 88 87 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure \ 89 88 --prefix=/usr \ … … 93 92 --with-headers=$LFS/usr/include \ 94 93 --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> 97 95 98 96 <variablelist> … … 207 205 </variablelist> 208 206 209 <!--210 The /usr which gets removed from the RTLDLIST by the sed211 below is set by the libc_cv_rtlddir=/usr/lib above. When212 changing the libc_cv_rtlddir to /lib, the content of the213 ldd script does not need to be patched, but some other214 symlinks created by glibc itself will be not that correct215 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 than219 only the pathes in ldd (it has influence on which symlinks220 to the loader are created where) and makes the handling221 in a multilib environment much easier.222 To me, it feels better to go the way with adding/removing223 /usr than to introduce a symlink hell.224 225 Another option to get ldd working properly is to set a226 symlink as "ln -svf lib /usr/lib64" but it has been reported227 that we used that already years ago but dropped it since228 libtool will complain sometimes with "library has been moved"229 warnings.230 Don't know if this is still the case - if not, this one231 symlink seems to be the cleanest way and the sed on ldd will232 be obsolete.233 -->234 207 <para>Fix hardcoded path to the executable loader in 235 208 <command>ldd</command> script:</para> … … 308 281 --libdir=/usr/lib32 \ 309 282 --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> 312 284 313 285 <para>Compile the package:</para> … … 381 353 --libdir=/usr/libx32 \ 382 354 --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> 385 356 386 357 <para>Compile the package:</para> -
chapter08/glibc.xml
r2606939 rd4b5218 73 73 --enable-stack-protector=strong \ 74 74 --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> 77 76 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr \ 78 77 --disable-werror \ … … 81 80 --with-headers=/usr/include \ 82 81 --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> 85 83 86 84 <variablelist> … … 519 517 --libdir=/usr/lib32 \ 520 518 --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> 523 520 524 521 <para>Compile the package:</para> … … 596 593 --libdir=/usr/libx32 \ 597 594 --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> 600 596 601 597 <para>Compile the package:</para> -
stylesheets/patcheslist.xsl
r2606939 rd4b5218 39 39 <xsl:text> 40 40 if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then 41 mail -s "Missing LFS patches" lfs-book@li nuxfromscratch.org < copyerrs41 mail -s "Missing LFS patches" lfs-book@lists.linuxfromscratch.org < copyerrs 42 42 fi

</xsl:text> 43 43
Note:
See TracChangeset
for help on using the changeset viewer.