gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2022-03-17 15:28:37 +01:00
commit d9bec1e96a
12 changed files with 222 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
chapter01/changelog.xml
View File

@ -40,6 +40,40 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2022-03-02</para>
<itemizedlist>
<listitem>
<para>[xry111] - Update to meson-0.61.2. Fixes
<ulink url="&lfs-ticket-root;5013">#5013</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to linux-5.16.12. Fixes
<ulink url="&lfs-ticket-root;5014">#5014</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
<ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to dbus-1.14.0. Fixes
<ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to vim-8.2.4489 (security fixes).
Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Build libstdc++ in GCC pass 2, and remove the
seperate libstdc++ pass 2.</para>
</listitem>
<listitem>
<para>[xry111] - Remove unneeded
<parameter>--enable-64bit</parameter> for tcl.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2022-03-01</para>
<itemizedlist>

196
chapter01/whatsnew.xml
View File

@ -11,10 +11,6 @@
<title>What's new since the last release</title>
<para>In this version of LFS, there has been a major reorganization
of the book using techniques that avoid changing the host system
and provides a more straight forward build process.</para>
<para>Below is a list of package updates made since the previous
release of the book.</para>
@ -39,153 +35,153 @@
<!--<listitem>
<para>Autoconf-&autoconf-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Automake-&automake-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Bash &bash-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Bc &bc-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Binutils-&binutils-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Bison-&bison-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Bzip2-&bzip2-version;</para>
</listitem>-->
<!--<listitem>
<para>Check-&check-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Coreutils-&coreutils-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>DejaGNU-&dejagnu-version;</para>
</listitem>-->
<!--<listitem revision="systemd">
<listitem revision="systemd">
<para>D-Bus-&dbus-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Diffutils-&diffutils-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>E2fsprogs-&e2fsprogs-version;</para>
</listitem>
<listitem revision="sysv">
</listitem>-->
<!--<listitem revision="sysv">
<para>Eudev-&eudev-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Expat-&expat-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Expect-&expect-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>File-&file-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Findutils-&findutils-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Flex-&flex-version;</para>
</listitem>-->
<listitem>
<para>Gawk-&gawk-version;</para>
</listitem>
<!--<listitem>
<para>Gawk-&gawk-version;</para>
</listitem>-->
<!--<listitem>
<para>GCC-&gcc-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>GDBM-&gdbm-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Gettext-&gettext-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Glibc-&glibc-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>GMP-&gmp-version;</para>
</listitem>-->
<!--<listitem>
<para>Gperf-&gperf-version;</para>
</listitem>-->
<!--<listitem>
<!--<listitem>
<para>Grep-&grep-version;</para>
</listitem>-->
<!--<listitem>
<para>Groff-&groff-version;</para>
</listitem>-->
<!--<listitem>
<!--<listitem>
<para>GRUB-&grub-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Gzip-&gzip-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>IANA-Etc-&iana-etc-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Inetutils-&inetutils-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Intltool-&intltool-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>IPRoute2-&iproute2-version;</para>
</listitem>
<listitem revision="systemd">
</listitem>-->
<!--<listitem revision="systemd">
<para>Jinja2-&jinja2-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Kbd-&kbd-version;</para>
</listitem>-->
<!--<listitem>
<!--<listitem>
<para>Kmod-&kmod-version;</para>
</listitem>-->
<!--<listitem>
<!--<listitem>
<para>Less-&less-version;</para>
</listitem>-->
<!--<listitem>
<para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Libcap-&libcap-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Libelf-&elfutils-version; (from elfutils)</para>
</listitem>
<!--<listitem>
</listitem>-->
<!--<listitem>
<para>Libffi-&libffi-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Libpipeline-&libpipeline-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Libtool-&libtool-version;</para>
</listitem>-->
<listitem>
<para>Linux-&linux-version;</para>
</listitem>
<!--<listitem>
<!--<listitem>
<para>M4-&m4-version;</para>
</listitem>-->
<!--<listitem>
<para>Make-&make-version;</para>
</listitem>-->
<listitem>
<para>Man-DB-&man-db-version;</para>
</listitem>
<!--<listitem>
<para>Man-DB-&man-db-version;</para>
</listitem>-->
<!--<listitem>
<para>Man-pages-&man-pages-version;</para>
</listitem>-->
<!--<listitem revision="systemd">
<listitem revision="systemd">
<para>MarkupSafe-&markupsafe-version;</para>
</listitem>-->
</listitem>
<listitem>
<para>Meson-&meson-version;</para>
</listitem>
@ -195,19 +191,19 @@
<!--<listitem>
<para>MPFR-&mpfr-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Ncurses-&ncurses-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Ninja-&ninja-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Openssl-&openssl-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Patch-&patch-version;</para>
</listitem>-->
<!--<listitem>
<!--<listitem>
<para>Perl-&perl-version;</para>
</listitem>-->
<!--<listitem>
@ -219,42 +215,42 @@
<!--<listitem>
<para>Psmisc-&psmisc-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Python-&python-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Readline-&readline-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Sed-&sed-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Shadow-&shadow-version;</para>
</listitem>
<!--<listitem revision="sysv">
</listitem>-->
<!--<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>-->
<listitem revision="systemd">
<!--<listitem revision="systemd">
<para>Systemd-&systemd-version;</para>
</listitem>
<listitem revision="sysv">
</listitem>-->
<!--<listitem revision="sysv">
<para>SysVinit-&sysvinit-version;</para>
</listitem>
</listitem>-->
<!--<listitem>
<para>Tar-&tar-version;</para>
</listitem>-->
<listitem>
<para>Tcl-&tcl-version;</para>
</listitem>
<!--<listitem>
<para>Tcl-&tcl-version;</para>
</listitem>-->
<!--<listitem>
<para>Texinfo-&texinfo-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Tzdata-&tzdata-version;</para>
</listitem>
<listitem>
</listitem>-->
<!--<listitem>
<para>Util-Linux-&util-linux-version;</para>
</listitem>
</listitem>-->
<listitem>
<para>Vim-&vim-version;</para>
</listitem>
@ -267,9 +263,9 @@
<!--<listitem>
<para>Zlib-&zlib-version;</para>
</listitem>-->
<listitem>
<!--<listitem>
<para>Zstd-&zstd-version;</para>
</listitem>
</listitem>-->
</itemizedlist>
<!--<itemizedlist>
@ -284,30 +280,12 @@
<itemizedlist>
<title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
<listitem>
<para>binutils-2.38-lto_fix-1.patch</para>
</listitem>
<listitem>
<para>coreutils-9.0-chmod_fix-1.patch</para>
</listitem>
<listitem>
<para>file-5.40-upstream_fixes-1.patch</para>
</listitem>
<listitem>
<para>shadow-4.10-useradd_segfault-1.patch</para>
</listitem>
<listitem revision="sysv">
<para>sysvinit-3.01-consolidated-1.patch</para>
</listitem>
<listitem revision="systemd">
<para>systemd-250-upstream_fixes-1.patch</para>
</listitem>
<!--
<listitem revision="systemd">
<para>MarkupSafe-&markupsafe-version;</para>
<listitem>
<para>binutils-2.37-upstream_fix-1.patch</para>
</listitem>
<listitem revision="systemd">
<para>Jinja2-&jinja2-version;</para>
<listitem>
<para>gcc-11.1.0-upstream_fixes-1.patch</para>
</listitem>
-->
</itemizedlist>

8
chapter05/libstdc++.xml
View File

@ -5,8 +5,8 @@
%general-entities;
]>
<sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
<?dbhtml filename="gcc-libstdc++-pass1.html"?>
<sect1 id="ch-tools-libstdcpp" role="wrap">
<?dbhtml filename="gcc-libstdc++.html"?>
<sect1info condition="script">
<productname>gcc-libstdc++</productname>
@ -14,9 +14,9 @@
<address>&gcc-url;</address>
</sect1info>
<title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
<title>Libstdc++ from GCC-&gcc-version;</title>
<indexterm zone="ch-tools-libstdcpp-pass1">
<indexterm zone="ch-tools-libstdcpp">
<primary sortas="a-GCC">GCC</primary>
<secondary>tools, libstdc++ pass 1</secondary>
</indexterm>

57
chapter06/gcc-pass2.xml
View File

@ -64,26 +64,30 @@ mv -v mpc-&mpc-version; mpc</userinput></screen>
;;
esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">Change the default directory name for
<para arch="ml_32,ml_x32,ml_all">Change the default directory name for the
libraries:</para>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
-i.orig gcc/config/i386/t-linux64</userinput></screen>
<!--
<screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
-->
<!-- https://gcc.gnu.org/PR100017 -->
<para>Fix an issue causing failure cross-compiling libstdc++:</para>
<screen><userinput remap="pre">sed 's/gnu++17/&amp; -nostdinc++/' \
-i libstdc++-v3/src/c++17/Makefile.in</userinput></screen>
<para>Override the building rule of libgcc and libstdc++ headers, to
allow building these libraries with POSIX threads support:</para>
<screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \
-i libgcc/Makefile.in libstdc++-v3/include/Makefile.in</userinput></screen>
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v build
cd build</userinput></screen>
<para>Create a symlink that allows libgcc to be built with posix threads
support:</para>
<screen><userinput remap="pre">mkdir -pv $LFS_TGT/libgcc
ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></screen>
<para>Before starting to build GCC, remember to unset any environment
variables that override the default optimization flags.</para>
@ -92,8 +96,9 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
<screen arch="default"><userinput remap="configure">../configure \
--build=$(../config.guess) \
--host=$LFS_TGT \
--target=$LFS_TGT \
LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
--prefix=/usr \
CC_FOR_TARGET=$LFS_TGT-gcc \
--with-build-sysroot=$LFS \
--enable-initfini-array \
--disable-nls \
@ -104,7 +109,6 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
--disable-libquadmath \
--disable-libssp \
--disable-libvtv \
--disable-libstdcxx \
--enable-languages=c,c++</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure"
arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
@ -132,7 +136,7 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
<title>The meaning of the new configure options:</title><!-- WIP -->
<varlistentry>
<term><parameter>-with-build-sysroot=$LFS</parameter></term>
<term><parameter>--with-build-sysroot=$LFS</parameter></term>
<listitem>
<para>Normally, using <parameter>--host</parameter> ensures that
a cross-compiler is used for building GCC, and that compiler knows
@ -144,6 +148,33 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--target=$LFS_TGT</parameter></term>
<listitem>
<para>As we are cross-compiling GCC, it's impossible to build
target libraries (<filename class="libraryfile">libgcc</filename>
and <filename class="libraryfile">libstdc++</filename>) with the
compiled GCC binaries because these binaries won't run on the
host distro. GCC building system will attempt to use the
C and C++ compilers on the host distro as a workaround by default.
It's not supported to build GCC target libraries with a different
version of GCC, so using host compilers may cause building
failure. This parameter ensures to build the libraries with GCC
pass 1 and prevent the issue.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
<listitem>
<para>Allow <filename class="libraryfile">libstdc++</filename> to
use shared <filename class="libraryfile">libgcc</filename> being
built in this pass, instead of the static version built in GCC
pass 1. This is needed for supporting C++ exception
handling.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--enable-initfini-array</parameter></term>
<listitem>

1
chapter07/chapter07.xml
View File

@ -17,7 +17,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>

137
chapter07/libstdc++-pass2.xml
View File

@ -1,137 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../general.ent">
%general-entities;
]>
<sect1 id="ch-tools-libstdcpp-pass2" role="wrap">
<?dbhtml filename="gcc-libstdc++-pass2.html"?>
<sect1info condition="script">
<productname>gcc-libstdc++</productname>
<productnumber>&gcc-version;</productnumber>
<address>&gcc-url;</address>
</sect1info>
<title>Libstdc++ from GCC-&gcc-version;, Pass 2</title>
<indexterm zone="ch-tools-libstdcpp-pass2">
<primary sortas="a-GCC">GCC</primary>
<secondary>tools, libstdc++ pass 2</secondary>
</indexterm>
<sect2 role="package">
<title/>
<para>When building <xref linkend="ch-tools-gcc-pass2"/> we had to defer
the installation of the C++ standard library because no suitable compiler
was available to compile it. We could not use the compiler built in that
section because it is a native compiler and should not be used outside of
chroot and risks polluting the libraries with some host components.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
<segtitle>&diskspace;</segtitle>
<seglistitem>
<seg>&libstdcpp-tmpp2-sbu;</seg>
<seg>&libstdcpp-tmpp2-du;</seg>
</seglistitem>
</segmentedlist>
</sect2>
<sect2 role="installation">
<title>Installation of Target Libstdc++</title>
<note>
<para><application>Libstdc++</application> is part of the GCC sources.
You should first unpack the GCC tarball and change to the
<filename>gcc-&gcc-version;</filename> directory.</para>
</note>
<para>Create a link which exists when building libstdc++ in the gcc tree:</para>
<screen><userinput remap="pre">ln -s gthr-posix.h libgcc/gthr-default.h</userinput></screen>
<para>Create a separate build directory for libstdc++ and enter it:</para>
<screen><userinput remap="pre">mkdir -v build
cd build</userinput></screen>
<para>Prepare libstdc++ for compilation:</para>
<screen arch="default"><userinput remap="configure">../libstdc++-v3/configure \
CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
--prefix=/usr \
--disable-multilib \
--disable-nls \
--host=$(uname -m)-lfs-linux-gnu \
--disable-libstdcxx-pch</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../libstdc++-v3/configure \
CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
--prefix=/usr \
--enable-multilib \
--disable-nls \
--host=$(uname -m)-lfs-linux-gnu \
--disable-libstdcxx-pch</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>CXXFLAGS="-g -O2 -D_GNU_SOURCE"</parameter></term>
<listitem>
<para>These flags are passed by the top level Makefile when doing
a full build of GCC.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--host=$(uname -m)-lfs-linux-gnu</parameter></term>
<listitem>
<para>We have to mimic what would happen if this package were built
as part of a full compiler build. This switch would be passed to
configure by GCC's build machinery.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--disable-libstdcxx-pch</parameter></term>
<listitem>
<para>This switch prevents the installation of precompiled
include files, which are not needed at this stage.</para>
</listitem>
</varlistentry>
<varlistentry arch="ml_32,ml_x32,ml_all">
<term><parameter>--enable-multilib</parameter></term>
<listitem>
<para>This switch is set by default but it is added here
explicitly for documentary purpose. The libstdc++ libraries
will be built for every arch (m64, m32, mx32) which are
made available in <xref linkend="ch-tools-gcc-pass1"/>.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile libstdc++ by running:</para>
<screen><userinput remap="make">make</userinput></screen>
<para>Install the library:</para>
<screen><userinput remap="install">make install</userinput></screen>
</sect2>
<sect2 role="content">
<title/>
<para>Details on this package are located in <xref linkend="contents-gcc" role="."/></para>
</sect2>
</sect1>

126
chapter08/adjusting.xml
View File

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../general.ent">
%general-entities;
]>
<sect1 id="ch-system-adjusting">
<?dbhtml filename="adjusting.html"?>
<title>Adjusting the Toolchain</title>
<para>Now that the final C libraries have been installed, it is time to adjust
the toolchain so that it will link any
newly compiled program against these new libraries.</para>
<para>First, backup the <filename class="directory">/tools</filename> linker,
and replace it with the adjusted linker we made in chapter 5. We'll also create
a link to its counterpart in
<filename class="directory">/tools/$(uname -m)-pc-linux-gnu/bin</filename>:</para>
<screen><userinput>mv -v /tools/bin/{ld,ld-old}
mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
mv -v /tools/bin/{ld-new,ld}
ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
<para>the next command amends the GCC specs file to achieve three goals:
first point GCC to the new dynamic linker. Simply deleting all instances of
<quote>/tools</quote> should leave us with the correct path to the dynamic
linker. Second, let GCC know where to find the Glibc start files. Third,
add the /usr/include directory at the end of the default search path, so
that header files added in chapter 6 are found.
A <command>sed</command> command accomplishes this:</para>
<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \
-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
-e '/\*cpp:/{n;s@$@ -idirafter /usr/include@}' &gt; \
`dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
<para>It is a good idea to visually inspect the specs file to verify the
intended change was actually made.</para>
<para>It is imperative at this point to ensure that the basic
functions (compiling and linking) of the adjusted toolchain are working
as expected. To do this, perform the following sanity checks:</para>
<screen os="a"><userinput>echo 'int main(){}' &gt; dummy.c
cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
readelf -l a.out | grep ': /lib'</userinput></screen>
<para os="b">There should be no errors,
and the output of the last command will be (allowing for
platform-specific differences in the dynamic linker name):</para>
<screen os="c"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
<para>Note that on 64-bit systems <filename class="directory">/lib</filename> is
the location of our dynamic linker, but is accessed via a symbolic link
in /lib64.</para>
<note><para>On 32-bit systems the interpreter should be
/lib/ld-linux.so.2.</para></note>
<para os="d">Now make sure that we're setup to use the correct start files:</para>
<screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
<para os="f">The output of the last command should be:</para>
<screen><computeroutput>/usr/lib/../lib/crt1.o succeeded
/usr/lib/../lib/crti.o succeeded
/usr/lib/../lib/crtn.o succeeded</computeroutput></screen>
<para os="g">Verify that the compiler is searching for the correct header
files:</para>
<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
<para os="h">This command should return the following output:</para>
<screen><computeroutput>#include &lt;...&gt; search starts here:
/tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
/tools/include
/tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include-fixed
/usr/include</computeroutput></screen>
<note><para>On a 32 bit system, x86_64 is replaced with i686.</para></note>
<para os="i">Next, verify that the new linker is being used with the correct search paths:</para>
<screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
<para os="k">References to paths that have components with '-linux-gnu' should
be ignored, but otherwise the output of the last command should be:</para>
<screen><computeroutput>SEARCH_DIR("/usr/lib")
SEARCH_DIR("/lib")</computeroutput></screen>
<para os="l">Next make sure that we're using the correct libc:</para>
<screen os="m"><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
<para os="n">The output of the last command should be:</para>
<screen os="o"><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
<para os="p">Make sure GCC is using the correct dynamic linker:</para>
<screen os="q"><userinput>grep found dummy.log</userinput></screen>
<para os="r">The output of the last command should be (allowing for
platform-specific differences in dynamic linker name):</para>
<screen os="s"><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
<para os="t">If the output does not appear as shown above or is not received
at all, then something is seriously wrong. Investigate and retrace the
steps to find out where the problem is and correct it. <!--The most likely
reason is that something went wrong with the specs file adjustment.--> Any
issues will need to be resolved before continuing with the process.</para>
<para os="u">Once everything is working correctly, clean up the test files:</para>
<screen os="v"><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
</sect1>

99
chapter08/gcc.xml
View File

@ -215,29 +215,21 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
that compiling and linking will work as expected. We do this by performing
some sanity checks:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen><userinput>echo 'int main(){}' &gt; dummy.c
cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
readelf -l a.out | grep ': /lib'</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='b'])"/>
<para>There should be no errors,
and the output of the last command will be (allowing for
platform-specific differences in the dynamic linker name):</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='c'])"/>
<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='d'])"/>
<para>Now make sure that we're setup to use the correct start files:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='e'])"/>
<screen><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='f'])"/>
<para>The output of the last command should be:</para>
<screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crti.o succeeded
@ -250,15 +242,12 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
<filename>crt*.o</filename> files under the
<filename class="directory">/usr/lib</filename> directory.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='g'])"/>
<para>Verify that the compiler is searching for the correct header
files:</para>
<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='h'])"/>
<para>This command should return the following output:</para>
<screen><computeroutput>#include &lt;...&gt; search starts here:
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
@ -269,17 +258,12 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
<para>Again, the directory named after your target triplet may be
different than the above, depending on your system architecture.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='i'])"/>
<para>Next, verify that the new linker is being used with the correct search paths:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='j'])"/>
<screen><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='k'])"/>
<para>References to paths that have components with '-linux-gnu' should
be ignored, but otherwise the output of the last command should be:</para>
<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
SEARCH_DIR("/usr/local/lib64")
@ -303,49 +287,32 @@ SEARCH_DIR("/usr/local/lib")
SEARCH_DIR("/lib")
SEARCH_DIR("/usr/lib");</computeroutput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='l'])"/>
<para>Next make sure that we're using the correct libc:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='m'])"/>
<screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='n'])"/>
<para>The output of the last command should be:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='o'])"/>
<screen><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='p'])"/>
<para>Make sure GCC is using the correct dynamic linker:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='q'])"/>
<screen><userinput>grep found dummy.log</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='r'])"/>
<para>The output of the last command should be (allowing for
platform-specific differences in dynamic linker name):</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='s'])"/>
<screen><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='t'])"/>
<para>If the output does not appear as shown above or is not received
at all, then something is seriously wrong. Investigate and retrace the
steps to find out where the problem is and correct it. <!--The most likely
reason is that something went wrong with the specs file adjustment.--> Any
issues will need to be resolved before continuing with the process.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='u'])"/>
<para>Once everything is working correctly, clean up the test files:</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
xpointer="xpointer(//*[@os='v'])"/>
<screen><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
<para>Finally, move a misplaced file:</para>

2
chapter08/iproute2.xml
View File

@ -61,7 +61,7 @@ rm -fv man/man8/arpd.8</userinput></screen>
-->
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<screen><userinput remap="make">make NETNS_RUN_DIR=/run/netns</userinput></screen>
<para>This package does not have a working test suite.</para>
<!-- currently not useful, no tests actually run

2
chapter08/meson.xml
View File

@ -56,7 +56,7 @@
<screen><userinput remap="make">python3 setup.py build</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>The test suite requires some packages out of the scope of LFS.</para>
<para>Install the package:</para>

19
chapter08/tcl.xml
View File

@ -63,24 +63,7 @@
<screen><userinput remap="configure">SRCDIR=$(pwd)
cd unix
./configure --prefix=/usr \
--mandir=/usr/share/man \
$([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>$([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</parameter></term>
<listitem>
<para>The construct <parameter>$(&lt;shell command&gt;)</parameter>
is replaced by the output of the shell command. Here this output is
empty if running on a 32 bit machine, and is
<parameter>--enable-64bit</parameter> if running on a 64 bit machine.
</para>
</listitem>
</varlistentry>
</variablelist>
--mandir=/usr/share/man</userinput></screen>
<para>Build the package:</para>

34
packages.ent
View File

@ -114,10 +114,10 @@
<!ENTITY coreutils-fin-du "153 MB">
<!ENTITY coreutils-fin-sbu "2.6 SBU">
<!ENTITY dbus-version "1.12.20">
<!ENTITY dbus-size "2,048 KB">
<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
<!ENTITY dbus-md5 "dfe8a71f412e0b53be26ed4fbfdc91c4">
<!ENTITY dbus-version "1.14.0">
<!ENTITY dbus-size "1,332 KB">
<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
<!ENTITY dbus-md5 "ddd5570aff05191dbee8e42d751f1b7d">
<!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
<!ENTITY dbus-fin-du "18 MB">
<!ENTITY dbus-fin-sbu "0.1 SBU">
@ -436,12 +436,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "16">
<!ENTITY linux-patch-version "9">
<!ENTITY linux-patch-version "12">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "124,577 KB">
<!ENTITY linux-size "124,572 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "4d6a704bf3e249ef6189b6f17457084b">
<!ENTITY linux-md5 "e859941968400c4437bd62b4fe39b7b7">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
allnoconfig rounded down to allow for ongoing cleanups,
@ -491,18 +491,18 @@
<!ENTITY man-pages-fin-du "33 MB">
<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
<!ENTITY markupsafe-version "2.0.1">
<!ENTITY markupsafe-version "2.1.0">
<!ENTITY markupsafe-size "20 KB">
<!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
<!ENTITY markupsafe-md5 "892e0fefa3c488387e5cc0cad2daa523">
<!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/">
<!ENTITY markupsafe-md5 "1c3ef96104e89fc64f90e48194a4f154">
<!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
<!ENTITY markupsafe-fin-du "520 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.61.1">
<!ENTITY meson-size "1,963 KB">
<!ENTITY meson-version "0.61.2">
<!ENTITY meson-size "1,968 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "41 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
@ -729,13 +729,13 @@
<!ENTITY util-linux-fin-du "261 MB">
<!ENTITY util-linux-fin-sbu "1.1 SBU">
<!ENTITY vim-version "8.2.4383">
<!ENTITY vim-version "8.2.4489">
<!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82">
<!ENTITY vim-size "15,622 KB">
<!ENTITY vim-size "10,380 KB">
<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
<!ENTITY vim-md5 "3168ff48e382a1201bd0cbd0209bd3e0">
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
<!ENTITY vim-md5 "41e97917fc46d044ffe951c197509efe">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "206 MB">
<!ENTITY vim-fin-sbu "2.4 SBU">