[lfs] 01/01: Merge branch 'trunk' into multilib
git Owner ([email protected] via lfs-book Mailing List) <[email protected]> Mon, 22 Jun 2026 20:22:13 +0000
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch multilib in repository lfs. commit d2ff24edd386aa31ec032b5d6fb5dd4b639fb8c2 Merge: 97c84d4c0 ecc015b9a Author: zeckma-tech <[email protected]> AuthorDate: Mon Jun 22 14:22:04 2026 -0600 Merge branch 'trunk' into multilib chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 7 +++--- chapter03/patches.xml | 8 ------- chapter05/gcc-pass1.xml | 13 ++++++++++ chapter06/gcc-pass2.xml | 12 ++++++++++ chapter08/gcc.xml | 11 --------- chapter08/python.xml | 4 ---- chapter08/stripping.xml | 2 +- chapter09/systemd-custom.xml | 6 ++--- general.ent | 4 ++-- packages.ent | 56 ++++++++++++++++++++++---------------------- patches.ent | 4 ---- 12 files changed, 100 insertions(+), 65 deletions(-) diff --cc chapter05/gcc-pass1.xml index 4780655b8,6c6c8ddb3..c06829f74 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@@ -123,30 -97,27 +123,31 @@@ cd build</userinput></screen <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">../configure \ - --target=$LFS_TGT \ - --prefix=$LFS/tools \ - --with-glibc-version=&glibc-version; \ - --with-sysroot=$LFS \ - --with-newlib \ - --without-headers \ - --enable-default-pie \ - --enable-default-ssp \ - --disable-fixincludes \ - --disable-nls \ - --disable-shared \ - --disable-multilib \ - --disable-threads \ - --disable-libatomic \ - --disable-libgomp \ - --disable-libquadmath \ - --disable-libssp \ - --disable-libvtv \ - --disable-libstdcxx \ +<screen><userinput remap="configure">../configure \ + --target=$LFS_TGT \ + --prefix=$LFS/tools \ + --with-glibc-version=&glibc-version; \ + --with-sysroot=$LFS \ + --with-newlib \ + --without-headers \ + --enable-default-pie \ + --enable-default-ssp \ ++ --disable-fixincludes \ + --enable-initfini-array \ + --disable-nls \ + --disable-shared \ + --enable-multilib \ + --with-multilib-list=m64,m32 \ + --disable-decimal-float \ + --disable-threads \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libquadmath \ + --disable-libssp \ + --disable-libvtv \ + --disable-libstdcxx \ --enable-languages=c,c++</userinput></screen> + <variablelist> <title>The meaning of the configure options:</title> diff --cc chapter06/gcc-pass2.xml index 0ae4f1039,9f7d49d82..97ad58083 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@@ -76,24 -73,24 +76,25 @@@ cd build</userinput></screen <para>Now prepare GCC for compilation:</para> -<screen><userinput remap="configure">../configure \ - --build=$(../config.guess) \ - --host=$LFS_TGT \ - --target=$LFS_TGT \ - --prefix=/usr \ - --with-build-sysroot=$LFS \ - --enable-default-pie \ - --enable-default-ssp \ - --disable-fixincludes \ - --disable-nls \ - --disable-multilib \ - --disable-libatomic \ - --disable-libgomp \ - --disable-libquadmath \ - --disable-libsanitizer \ - --disable-libssp \ - --disable-libvtv \ - --enable-languages=c,c++ \ +<screen><userinput remap="configure">../configure \ + --build=$(../config.guess) \ + --host=$LFS_TGT \ + --target=$LFS_TGT \ + --prefix=/usr \ + --with-build-sysroot=$LFS \ + --enable-default-pie \ + --enable-default-ssp \ ++ --disable-fixincludes \ + --disable-nls \ + --enable-multilib \ + --with-multilib-list=m64,m32 \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libquadmath \ + --disable-libsanitizer \ + --disable-libssp \ + --disable-libvtv \ + --enable-languages=c,c++ \ LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \ target_configargs=gcc_cv_target_thread_file=posix</userinput></screen> diff --cc chapter08/stripping.xml index 040ce008a,de664ee99..39670ba89 --- a/chapter08/stripping.xml +++ b/chapter08/stripping.xml @@@ -84,17 -85,9 +84,17 @@@ for LIB in $save_usrlib; d install -vm755 /tmp/$LIB /usr/lib rm /tmp/$LIB done - +cd /usr/lib32 +for LIB in $save_usrlib; do + objcopy --only-keep-debug $LIB $LIB.dbg + cp $LIB /tmp/$LIB + strip --strip-unneeded /tmp/$LIB + objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB + install -vm755 /tmp/$LIB /usr/lib32 + rm /tmp/$LIB +done online_usrbin="bash find strip" - online_usrlib="libbfd-&binutils-version;.20260210.so + online_usrlib="libbfd-&binutils-version;.so libsframe.so.&libsframe-version; libhistory.so.&readline-soversion; libncursesw.so.&ncurses-base-version; diff --cc general.ent index 8ef3e7312,a817b2457..41bbf00ef --- a/general.ent +++ b/general.ent @@@ -7,9 -7,9 +7,9 @@@ <!ENTITY % rc "IGNORE"> <!-- set to INCLUDE for rc, set to IGNORE for development or release --> -<!ENTITY % relnum "12.3"><!-- must be given for release or rc --> -<!ENTITY % reldate "March 5th, 2025"><!-- must ve given for release or rc --> +<!ENTITY % relnum "13.0"><!-- must be given for release or rc --> - <!ENTITY % reldate "March 4th, 2026"><!-- must ve given for release or rc --> - <!ENTITY % crdate "1999-2026"><!-- must ve given for release or rc --> ++<!ENTITY % reldate "March 4th, 2026"><!-- must be given for release or rc --> + <!ENTITY % crdate "1999-2026"><!-- must be given for release or rc --> <!ENTITY % rcnum "0"><!-- must be given only for rc --> <!-- ================================================================== --> <!-- Do not change anything below unless the www or book layouts change --> diff --cc packages.ent index 1cc986a74,f2573c545..54b676df5 --- a/packages.ent +++ b/packages.ent @@@ -550,18 -540,10 +550,18 @@@ <!ENTITY ninja-fin-du "43 MB"> <!ENTITY ninja-fin-sbu "0.2 SBU"> +<!ENTITY openrc-version "0.63"> +<!ENTITY openrc-size "260 KB"> +<!ENTITY openrc-url "&github;/OpenRC/openrc/archive/&openrc-version;/openrc-&openrc-version;.tar.gz"> +<!ENTITY openrc-md5 "f73566fc120e19e5a96fb0134cbb5ac8"> +<!ENTITY openrc-home "https://wiki.gentoo.org/wiki/OpenRC"> +<!ENTITY openrc-fin-du "13 MB"> +<!ENTITY openrc-fin-sbu "0.1 SBU"> + - <!ENTITY openssl-version "4.0.0"> - <!ENTITY openssl-size "53,757 KB"> + <!ENTITY openssl-version "4.0.1"> + <!ENTITY openssl-size "53,789 KB"> <!ENTITY openssl-url "&github;/openssl/openssl/releases/download/openssl-&openssl-version;/openssl-&openssl-version;.tar.gz"> - <!ENTITY openssl-md5 "f26714e6398a2d921fc5616daaa75231"> + <!ENTITY openssl-md5 "07e316afe26b61e72206b81706b497bb"> <!ENTITY openssl-home "https://www.openssl-library.org/"> <!ENTITY openssl-fin-du "981 MB"> <!ENTITY openssl-fin-sbu "1.9 SBU"> -- To stop receiving notification emails like this one, please contact the administrator of this repository. -- http://lists.linuxfromscratch.org/sympa/info/lfs-book Unsubscribe: See the above information page