Merge Upstream up to 11848

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11849 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Pierre Labastie 2020-05-13 21:00:59 +00:00
parent 0f70354165
commit f1aad2eb3a
3 changed files with 3 additions and 3 deletions

View File

@ -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>

View File

@ -71,7 +71,7 @@
<para>Install the package and do some cleanup:</para>
<screen><userinput remap="install">make lib=lib install
<screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
chmod -v 755 /lib/libcap.so.&libcap-version;
mv -v /lib/libpsx.a /usr/lib
rm -v /lib/libcap.so

View File

@ -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\.]+).*$/" );