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

Merge changes from trunk to multilib

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11991 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-07-01 11:23:05 +00:00 committed by Xℹ Ruoyao
parent 07b2c96502
commit ce2f9d860e
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
6 changed files with 84 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
chapter01/changelog.xml
View File

@ -44,6 +44,32 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<itemizedlist>
<para>2020-07-01</para>
<listitem>
<para>[bdubbs] - Update to perl-5.32.0. Fixes
<ulink url="&lfs-ticket-root;4676">#4676</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to man-db-2.9.3. Fixes
<ulink url="&lfs-ticket-root;4680">#4680</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.7.6. Fixes
<ulink url="&lfs-ticket-root;4674">#4674</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to check-0.15.0. Fixes
<ulink url="&lfs-ticket-root;4679">#4679</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bc-3.0.3. Fixes
<ulink url="&lfs-ticket-root;4675">#4675</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd"> <listitem revision="systemd">
<itemizedlist> <itemizedlist>
<para>2020-06-22</para> <para>2020-06-22</para>

4
chapter01/whatsnew.xml
View File

@ -57,9 +57,9 @@
<!--<listitem> <!--<listitem>
<para>Bzip2-&bzip2-version;</para> <para>Bzip2-&bzip2-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Check-&check-version;</para> <para>Check-&check-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Coreutils-&coreutils-version;</para> <para>Coreutils-&coreutils-version;</para>
</listitem> </listitem>

10
chapter07/perl.xml
View File

@ -45,7 +45,15 @@
<para>Prepare Perl for compilation:</para> <para>Prepare Perl for compilation:</para>
<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr</userinput></screen> <screen><userinput remap="configure">sh Configure -des \
-Dprefix=/usr \
-Dvendorprefix=/usr \
-Dprivlib=/usr/share/perl5/core_perl \
-Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl \
-Dsitelib=/usr/share/perl5/site_perl \
-Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl \
-Dvendorlib=/usr/share/perl5/vendor_perl \
-Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the new Configure options:</title> <title>The meaning of the new Configure options:</title>

38
chapter08/perl.xml
View File

@ -49,25 +49,26 @@
<screen><userinput remap="pre">export BUILD_ZLIB=False <screen><userinput remap="pre">export BUILD_ZLIB=False
export BUILD_BZIP2=0</userinput></screen> export BUILD_BZIP2=0</userinput></screen>
<!--
<para>Apply a patch to allow the Errno.pm module and the h2ph
program to build correctly when building with GCC 5:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&perl-gcc5-fixes-patch;</userinput></screen>
-->
<para>To have full control over the way Perl is set up, you can remove the <para>To have full control over the way Perl is set up, you can remove the
<quote>-des</quote> options from the following command and hand-pick the way <quote>-des</quote> options from the following command and hand-pick the way
this package is built. Alternatively, use the command exactly as below to this package is built. Alternatively, use the command exactly as below to
use the defaults that Perl auto-detects:</para> use the defaults that Perl auto-detects:</para>
<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \ <screen><userinput remap="configure">sh Configure -des \
-Dvendorprefix=/usr \ -Dprefix=/usr \
-Dman1dir=/usr/share/man/man1 \ -Dvendorprefix=/usr \
-Dman3dir=/usr/share/man/man3 \ -Dprivlib=/usr/share/perl5/core_perl \
-Dpager="/usr/bin/less -isR" \ -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl \
-Duseshrplib \ -Dsitelib=/usr/share/perl5/site_perl \
-Dusethreads</userinput></screen> -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl \
-Dvendorlib=/usr/share/perl5/vendor_perl \
-Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl \
-Dman1dir=/usr/share/man/man1 \
-Dman3dir=/usr/share/man/man3 \
-Dpager="/usr/bin/less -isR" \
-Duseshrplib \
-Dusethreads</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the configure options:</title> <title>The meaning of the configure options:</title>
@ -112,6 +113,17 @@ export BUILD_BZIP2=0</userinput></screen>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
<listitem>
<para>These settings define where Perl is looking 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 (&perl-version;) without
the need to reinstall all of the modules again.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
<para>Compile the package:</para> <para>Compile the package:</para>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20200622"> <!ENTITY version "SVN-20200701">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; <!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases --> Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20200622-systemd"> <!ENTITY versiond "20200701-systemd">
<!ENTITY short-versiond "systemd"> <!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd"> <!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "June 22nd, 2020"> <!ENTITY releasedate "July 1st, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

55
packages.ent
View File

@ -57,10 +57,10 @@
<!ENTITY bash-fin-du "48 MB"> <!ENTITY bash-fin-du "48 MB">
<!ENTITY bash-fin-sbu "1.8 SBU"> <!ENTITY bash-fin-sbu "1.8 SBU">
<!ENTITY bc-version "2.7.2"> <!ENTITY bc-version "3.0.3">
<!ENTITY bc-size "185 KB"> <!ENTITY bc-size "198 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz"> <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051"> <!ENTITY bc-md5 "e70c43d6f829e20ecd8c7129efe3502b">
<!ENTITY bc-home "https://git.yzena.com/gavin/bc"> <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
<!ENTITY bc-fin-du "3.2 MB"> <!ENTITY bc-fin-du "3.2 MB">
<!ENTITY bc-fin-sbu "0.1 SBU"> <!ENTITY bc-fin-sbu "0.1 SBU">
@ -92,28 +92,13 @@
<!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz"> <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
<!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5"> <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
<!ENTITY bzip2-home " "> <!ENTITY bzip2-home " ">
<!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
<!-- No more bzip2 in temp tools
<!ENTITY bzip2-tmp-du "6.4 MB">
<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU">-->
<!ENTITY bzip2-fin-du "7.7 MB"> <!ENTITY bzip2-fin-du "7.7 MB">
<!ENTITY bzip2-fin-sbu "less than 0.1 SBU"> <!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
<!-- Does not seem to be used in this book
<!ENTITY ref5-version "&version;"> <!ENTITY check-version "0.15.0">
<!ENTITY ref5-size "REF5-SUM KB"> <!ENTITY check-size "757 KB">
<!ENTITY ref5-url "&anduin-sources;/reference-files/chapter5-files-&version;.ref">
<!ENTITY ref5-md5 "REF5-MD5SUM">
<!ENTITY ref6-version "&version;">
<!ENTITY ref6-size "REF6-SUM KB">
<!ENTITY ref6-url "&anduin-sources;/reference-files/chapter6-files-&version;.ref">
<!ENTITY ref6-md5 "REF6-MD5SUM">
-->
<!ENTITY check-version "0.14.0">
<!ENTITY check-size "753 KB">
<!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz"> <!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
<!ENTITY check-md5 "270e82a445be6026040267a5e11cc94b"> <!ENTITY check-md5 "77b27bd48f9b16844c2f62333639a246">
<!ENTITY check-home "https://libcheck.github.io/check"> <!ENTITY check-home "https://libcheck.github.io/check">
<!ENTITY check-fin-du "12 MB"> <!ENTITY check-fin-du "12 MB">
<!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)"> <!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)">
@ -219,9 +204,6 @@
<!ENTITY flex-url "&github;/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz"> <!ENTITY flex-url "&github;/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz">
<!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d"> <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
<!ENTITY flex-home "&github;/westes/flex"> <!ENTITY flex-home "&github;/westes/flex">
<!-- only in final system now
<!ENTITY flex-tmp-du "15 MB">
<!ENTITY flex-tmp-sbu "0.1 SBU">-->
<!ENTITY flex-fin-du "36 MB"> <!ENTITY flex-fin-du "36 MB">
<!ENTITY flex-fin-sbu "0.4 SBU"> <!ENTITY flex-fin-sbu "0.4 SBU">
@ -250,9 +232,6 @@
<!ENTITY libstdcpp-version "6.0.28"> <!ENTITY libstdcpp-version "6.0.28">
<!ENTITY libitm-version "1.0.0"> <!ENTITY libitm-version "1.0.0">
<!ENTITY libatomic-version "1.2.0"> <!ENTITY libatomic-version "1.2.0">
<!--<!ENTITY libmpx-version "2.0.1">-->
<!--<!ENTITY libmpxwrap-version "2.0.1">-->
<!--<!ENTITY libcilkrts-version "5.0.0">-->
<!ENTITY libstdcpp-tmpp1-du "952 MB"> <!ENTITY libstdcpp-tmpp1-du "952 MB">
<!ENTITY libstdcpp-tmpp1-sbu "0.4 SBU"> <!ENTITY libstdcpp-tmpp1-sbu "0.4 SBU">
@ -446,12 +425,12 @@
<!ENTITY linux-major-version "5"> <!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "7"> <!ENTITY linux-minor-version "7">
<!ENTITY linux-patch-version "2"> <!ENTITY linux-patch-version "6">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "110,047 KB"> <!ENTITY linux-size "110,070 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "3aec12c426030b27553006ea515a91a1"> <!ENTITY linux-md5 "80eb1a79341d8a7d089fcf6113c1b421">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -485,10 +464,10 @@
<!ENTITY make-fin-du "13 MB"> <!ENTITY make-fin-du "13 MB">
<!ENTITY make-fin-sbu "0.5 SBU"> <!ENTITY make-fin-sbu "0.5 SBU">
<!ENTITY man-db-version "2.9.2"> <!ENTITY man-db-version "2.9.3">
<!ENTITY man-db-size "1,844 KB"> <!ENTITY man-db-size "1,842 KB">
<!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz"> <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
<!ENTITY man-db-md5 "86c7b99ce5969d9b20bf9aeae8d86e0b"> <!ENTITY man-db-md5 "4c8721faa54a4c950c640e5e5c713fb0">
<!ENTITY man-db-home "https://www.nongnu.org/man-db/"> <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
<!ENTITY man-db-fin-du "40 MB"> <!ENTITY man-db-fin-du "40 MB">
<!ENTITY man-db-fin-sbu "0.5 SBU"> <!ENTITY man-db-fin-sbu "0.5 SBU">
@ -561,10 +540,14 @@
<!ENTITY patch-fin-du "12 MB"> <!ENTITY patch-fin-du "12 MB">
<!ENTITY patch-fin-sbu "0.2 SBU"> <!ENTITY patch-fin-sbu "0.2 SBU">
<!ENTITY perl-version "5.30.3"> <!ENTITY perl-version-major "5">
<!ENTITY perl-size "12,088 KB"> <!ENTITY perl-version-minor "32">
<!ENTITY perl-version-patch "0">
<!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
<!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
<!ENTITY perl-size "12,420 KB">
<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz"> <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
<!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936"> <!ENTITY perl-md5 "3812cd9a096a72cb27767c7e2e40441c">
<!ENTITY perl-home "https://www.perl.org/"> <!ENTITY perl-home "https://www.perl.org/">
<!ENTITY perl-tmp-du "261 MB"> <!ENTITY perl-tmp-du "261 MB">
<!ENTITY perl-tmp-sbu "1.5 SBU"> <!ENTITY perl-tmp-sbu "1.5 SBU">