From f573e248623cc66db31cd96a541245cd1aedc9e1 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Tue, 12 May 2020 10:09:43 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11847 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 18 ++++++------ chapter01/changelog.xml | 10 +++++++ chapter06/openssl.xml | 4 ++- chapter06/systemd.xml | 57 ++++++++++++++++++++++--------------- general.ent | 4 +-- lfs-latest.php | 2 +- packages.ent | 10 +++---- 7 files changed, 64 insertions(+), 41 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 9bd07885b..d46acf603 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -260,7 +260,7 @@ &dependencies; - Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc, + Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, Glibc, Grep, Make, Perl, Sed, Texinfo and Zlib @@ -584,7 +584,7 @@ Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, - Make, and Sed + Make, Sed, and Util-linux @@ -780,7 +780,7 @@ &before; - IPRoute2, Kbd, and Man-DB + None @@ -824,7 +824,7 @@ &external; - None + libsigsegv @@ -927,7 +927,7 @@ &before; - Automake + Automake and Bison @@ -946,7 +946,7 @@ &dependencies; - Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext, + Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext, Grep, Gzip, Linux API Headers, Make, Perl, Python, Sed, and Texinfo @@ -1464,7 +1464,7 @@ &before; - None + Shadow @@ -2232,7 +2232,7 @@ Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep, - Libffi, Make, Ncurses, and Sed + Libffi, Make, Ncurses, Sed, and Util-linux @@ -2340,7 +2340,7 @@ Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, - Gettext, Glibc, Grep, Make, and Sed + Gettext, Glibc, Grep, Libcap, Make, and Sed diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6a973e516..d21a383b3 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2020-05-09 + + + [pierre] - Pass -Wno-format-overflow to systemd to + prevent an error with GCC 10. + + + + 2020-05-08 diff --git a/chapter06/openssl.xml b/chapter06/openssl.xml index 291f5887b..41f02651b 100644 --- a/chapter06/openssl.xml +++ b/chapter06/openssl.xml @@ -64,7 +64,9 @@ make test - One subtest in the test 20-test_enc.t is known to fail. + One test 30-test_afalg.t is known to fail on some kernel + configurations (it apparently assumes certain unspecified crypto + options have been selected). Install the package: diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index b37b8e067..1566261c2 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -69,34 +69,45 @@ 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 \ .. The meaning of the meson options: + + -Dc_args=-Wno-format-overflow + + The defaults flags passed to gcc contain + -Werror=format-overflow, which generates + an error with GCC 10. Passing this parameter prevents the error + from occuring. + + + -D*-path=* diff --git a/general.ent b/general.ent index d070562ca..2fa715f21 100644 --- a/general.ent +++ b/general.ent @@ -3,11 +3,11 @@ Change to x.y for release but not -rc releases --> - + - + diff --git a/lfs-latest.php b/lfs-latest.php index 629ce3192..6fe2ea0ca 100644 --- a/lfs-latest.php +++ b/lfs-latest.php @@ -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\.]+).*$/" ); diff --git a/packages.ent b/packages.ent index b22134789..6332346b1 100644 --- a/packages.ent +++ b/packages.ent @@ -539,13 +539,13 @@ - - + + - + - - + +