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

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2023-09-10 00:30:15 +02:00
commit b2f0a207d7
10 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chapter06/binutils-pass2.xml
View File

@ -43,11 +43,17 @@
<sect2 role="installation">
<title>Installation of Binutils</title>
<!-- Don't remove this until Binutils upstream updates the libtool
copy. On some host distros the issue doesn't show up. -->
<para>Binutils ships an outdated copy of libtool in the tarball. It lacks
sysroot support, so the produced binaries will be mistakenly linked to
libraries from the host distro. Work around this issue:</para>
<!-- Don't remove this until Binutils upstream resolves this issue.
We can test by building Binutils on a complete system with
zlib (libz.so) installed, passing enable-shared and
without-system-zlib. If the resulted libctf.so still links against
libz.so (check with readelf -d) despite we are saying
without-system-zlib, then the issue is still unresolved. -->
<para>Binutils relies on an internal libtool copy to link against
internal static libraries, but the libiberty and zlib copies shipped
in the package do not use libtool. This inconsistency may cause
produced binaries mistakenly linked against libraries from the host
distro. Work around this issue:</para>
<screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>

6
chapter06/coreutils.xml
View File

@ -43,17 +43,13 @@
<sect2 role="installation">
<title>Installation of Coreutils</title>
<!--
<screen><userinput remap="configure">export gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
-->
<para>Prepare Coreutils for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--host=$LFS_TGT \
--build=$(build-aux/config.guess) \
--enable-install-program=hostname \
--enable-no-install-program=kill,uptime \
gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
--enable-no-install-program=kill,uptime</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

32
chapter07/perl.xml
View File

@ -57,7 +57,8 @@
-Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
<variablelist>
<title>The meaning of the new Configure options:</title>
<title>The meaning of the Configure options:</title>
<varlistentry>
<term><parameter>-des</parameter></term>
<listitem>
@ -67,6 +68,35 @@
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dvendorprefix=/usr</parameter></term>
<listitem>
<para>This ensures <command>perl</command> knows how to
tell packages where they should install their Perl modules.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Duseshrplib</parameter></term>
<listitem>
<para>Build <systemitem class='library'>libperl</systemitem>
needed by some Perl modules as a shared library, instead of
a static library.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
<listitem>
<para>These settings define where Perl looks for installed
modules. The LFS editors chose to put them in a directory structure
based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
allows upgrading Perl to newer patch levels (the patch level is
the last dot separated part in the full version string like
&perl-version;) without reinstalling all of the modules.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para>

2
chapter08/gmp.xml
View File

@ -260,7 +260,7 @@ rm -rf DESTDIR</userinput></screen>
<title>Contents of GMP</title>
<segmentedlist>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed libraries</segtitle>
<segtitle>Installed directory</segtitle>
<seglistitem>

4
chapter08/libelf.xml
View File

@ -136,8 +136,8 @@ rm -rf DESTDIR</userinput></screen>
<title>Contents of Libelf</title>
<segmentedlist>
<segtitle>Installed Library</segtitle>
<segtitle>Installed Directory</segtitle>
<segtitle>Installed library</segtitle>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>

4
chapter08/mpc.xml
View File

@ -69,8 +69,8 @@ make install-html</userinput></screen>
<title>Contents of MPC</title>
<segmentedlist>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directory</segtitle>
<segtitle>Installed libraries</segtitle>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>libmpc.so</seg>

4
chapter08/mpfr.xml
View File

@ -58,7 +58,7 @@ make html</userinput></screen>
Do not skip it under any circumstances.</para>
</important>
<para>Test the results and ensure that all 197 tests passed:</para>
<para>Test the results and ensure that all 198 tests passed:</para>
<screen><userinput remap="test">make check</userinput></screen>
@ -74,7 +74,7 @@ make install-html</userinput></screen>
<title>Contents of MPFR</title>
<segmentedlist>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed libraries</segtitle>
<segtitle>Installed directory</segtitle>
<seglistitem>

29
chapter08/perl.xml
View File

@ -76,15 +76,7 @@ export BUILD_BZIP2=0</userinput></screen>
-Dusethreads</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>-Dvendorprefix=/usr</parameter></term>
<listitem>
<para>This ensures <command>perl</command> knows how to
tell packages where they should install their Perl modules.</para>
</listitem>
</varlistentry>
<title>The meaning of the new Configure options:</title>
<varlistentry>
<term><parameter>-Dpager="/usr/bin/less -isR"</parameter></term>
@ -104,13 +96,6 @@ export BUILD_BZIP2=0</userinput></screen>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Duseshrplib</parameter></term>
<listitem>
<para>Build a shared libperl needed by some Perl modules.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dusethreads</parameter></term>
<listitem>
@ -118,18 +103,6 @@ export BUILD_BZIP2=0</userinput></screen>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
<listitem>
<para>These settings define where Perl looks for installed
modules. The LFS editors chose to put them in a directory structure
based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
allows upgrading Perl to newer patch levels (the patch level is
the last dot separated part in the full version string like
&perl-version;) without reinstalling all of the modules.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para>

6
chapter08/python.xml
View File

@ -191,9 +191,9 @@ tar --strip-components=1 \
<title>Contents of Python 3</title>
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Library</segtitle>
<segtitle>Installed Directories</segtitle>
<segtitle>Installed programs</segtitle>
<segtitle>Installed library</segtitle>
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>

2
chapter08/util-linux.xml
View File

@ -42,7 +42,7 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
<para>First, disable a problem test:</para>
<para>First, disable a problematic test:</para>
<screen><userinput remap="pre">sed -i '/test_mkfds/s/^/#/' tests/helpers/Makemodule.am</userinput></screen>