mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-03-06 06:14:47 +00:00
MultiLib: Merge changes from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11847 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl
Xℹ Ruoyao
parent
81e195d0ba
commit
95906db003
@ -260,7 +260,7 @@
|
||||
<segtitle>&dependencies;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc,
|
||||
<seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, Glibc,
|
||||
Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
@ -584,7 +584,7 @@
|
||||
|
||||
<seglistitem>
|
||||
<seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf,
|
||||
Make, and Sed</seg>
|
||||
Make, Sed, and Util-linux</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -780,7 +780,7 @@
|
||||
<segtitle>&before;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>IPRoute2, Kbd, and Man-DB</seg>
|
||||
<seg>None</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -824,7 +824,7 @@
|
||||
<segtitle>&external;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>None</seg>
|
||||
<seg>libsigsegv</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -927,7 +927,7 @@
|
||||
<segtitle>&before;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>Automake</seg>
|
||||
<seg>Automake and Bison</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -946,7 +946,7 @@
|
||||
<segtitle>&dependencies;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
|
||||
<seg>Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext,
|
||||
Grep, Gzip, Linux API Headers, Make, Perl, Python, Sed, and Texinfo</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
@ -1464,7 +1464,7 @@
|
||||
<segtitle>&before;</segtitle>
|
||||
|
||||
<seglistitem>
|
||||
<seg>None</seg>
|
||||
<seg>Shadow</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -2232,7 +2232,7 @@
|
||||
|
||||
<seglistitem>
|
||||
<seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep,
|
||||
Libffi, Make, Ncurses, and Sed</seg>
|
||||
Libffi, Make, Ncurses, Sed, and Util-linux</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
@ -2340,7 +2340,7 @@
|
||||
|
||||
<seglistitem>
|
||||
<seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
|
||||
Gettext, Glibc, Grep, Make, and Sed</seg>
|
||||
Gettext, Glibc, Grep, Libcap, Make, and Sed</seg>
|
||||
</seglistitem>
|
||||
</segmentedlist>
|
||||
|
||||
|
||||
@ -44,6 +44,16 @@
|
||||
<listitem revision="sysv"> or <listitem revision="systemd"> as
|
||||
appropriate for the entry or if needed the entire day's listitem.
|
||||
-->
|
||||
<listitem revision="systemd">
|
||||
<para>2020-05-09</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[pierre] - Pass -Wno-format-overflow to systemd to
|
||||
prevent an error with GCC 10.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>2020-05-08</para>
|
||||
<itemizedlist>
|
||||
|
||||
@ -64,7 +64,9 @@
|
||||
|
||||
<screen><userinput remap="test">make test</userinput></screen>
|
||||
|
||||
<para>One subtest in the test 20-test_enc.t is known to fail.</para>
|
||||
<para>One test 30-test_afalg.t is known to fail on some kernel
|
||||
configurations (it apparently assumes certain unspecified crypto
|
||||
options have been selected).</para>
|
||||
|
||||
<para>Install the package:</para>
|
||||
|
||||
|
||||
@ -69,34 +69,45 @@
|
||||
<screen><userinput remap="configure">mkdir -p build
|
||||
cd build
|
||||
|
||||
LANG=en_US.UTF-8 \
|
||||
meson --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
-Dblkid=true \
|
||||
-Dbuildtype=release \
|
||||
-Ddefault-dnssec=no \
|
||||
-Dfirstboot=false \
|
||||
-Dinstall-tests=false \
|
||||
-Dkmod-path=/bin/kmod \
|
||||
-Dldconfig=false \
|
||||
-Dmount-path=/bin/mount \
|
||||
-Drootprefix= \
|
||||
-Drootlibdir=/lib \
|
||||
-Dsplit-usr=true \
|
||||
-Dsulogin-path=/sbin/sulogin \
|
||||
-Dsysusers=false \
|
||||
-Dumount-path=/bin/umount \
|
||||
-Db_lto=false \
|
||||
-Drpmmacrosdir=no \
|
||||
-Dhomed=false \
|
||||
-Duserdb=false \
|
||||
-Dman=true \
|
||||
LANG=en_US.UTF-8 \
|
||||
meson --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
-Dc_args=-Wno-format-overflow \
|
||||
-Dblkid=true \
|
||||
-Dbuildtype=release \
|
||||
-Ddefault-dnssec=no \
|
||||
-Dfirstboot=false \
|
||||
-Dinstall-tests=false \
|
||||
-Dkmod-path=/bin/kmod \
|
||||
-Dldconfig=false \
|
||||
-Dmount-path=/bin/mount \
|
||||
-Drootprefix= \
|
||||
-Drootlibdir=/lib \
|
||||
-Dsplit-usr=true \
|
||||
-Dsulogin-path=/sbin/sulogin \
|
||||
-Dsysusers=false \
|
||||
-Dumount-path=/bin/umount \
|
||||
-Db_lto=false \
|
||||
-Drpmmacrosdir=no \
|
||||
-Dhomed=false \
|
||||
-Duserdb=false \
|
||||
-Dman=true \
|
||||
..</userinput></screen>
|
||||
|
||||
<variablelist>
|
||||
<title>The meaning of the meson options:</title>
|
||||
|
||||
<varlistentry>
|
||||
<term><parameter>-Dc_args=-Wno-format-overflow</parameter></term>
|
||||
<listitem>
|
||||
<para>The defaults flags passed to gcc contain
|
||||
<parameter>-Werror=format-overflow</parameter>, which generates
|
||||
an error with GCC 10. Passing this parameter prevents the error
|
||||
from occuring.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><parameter>-D*-path=*</parameter></term>
|
||||
<listitem>
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
Change to x.y for release but not -rc releases -->
|
||||
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
|
||||
|
||||
<!ENTITY versiond "20200508-systemd">
|
||||
<!ENTITY versiond "20200509-systemd">
|
||||
<!ENTITY short-versiond "systemd">
|
||||
<!ENTITY generic-versiond "systemd">
|
||||
|
||||
<!ENTITY releasedate "May 8th, 2020">
|
||||
<!ENTITY releasedate "May 9th, 2020">
|
||||
|
||||
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – -->
|
||||
|
||||
|
||||
@ -280,7 +280,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
|
||||
}
|
||||
|
||||
if ( $package == "procps-ng" )
|
||||
return find_max( $lines, "/release/", "/^.* ([\d\.]+).*$/" );
|
||||
return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).*$/" );
|
||||
|
||||
if ( $package == "psmisc" )
|
||||
return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
|
||||
|
||||
10
packages.ent
10
packages.ent
@ -539,13 +539,13 @@
|
||||
<!ENTITY ninja-ch6-du "89 MB">
|
||||
<!ENTITY ninja-ch6-sbu "0.3 SBU">
|
||||
|
||||
<!ENTITY openssl-version "1.1.1f">
|
||||
<!ENTITY openssl-size "9,564 KB">
|
||||
<!ENTITY openssl-version "1.1.1g">
|
||||
<!ENTITY openssl-size "9,572 KB">
|
||||
<!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
|
||||
<!ENTITY openssl-md5 "3f486f2f4435ef14b81814dbbc7b48bb">
|
||||
<!ENTITY openssl-md5 "76766e98997660138cdaf13a187bd234">
|
||||
<!ENTITY openssl-home "https://www.openssl.org/">
|
||||
<!ENTITY openssl-ch6-du "146 MB">
|
||||
<!ENTITY openssl-ch6-sbu "2.1 SBU">
|
||||
<!ENTITY openssl-ch6-du "147 MB">
|
||||
<!ENTITY openssl-ch6-sbu "2.2 SBU">
|
||||
|
||||
<!ENTITY patch-version "2.7.6">
|
||||
<!ENTITY patch-size "766 KB">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user