diff options
| author | Pierre Labastie <pieere@linuxfromscratch.org> | 2020-05-13 21:00:59 +0000 |
|---|---|---|
| committer | Pierre Labastie <pieere@linuxfromscratch.org> | 2020-05-13 21:00:59 +0000 |
| commit | f1aad2eb3a6b9995010c88bbbcd4712713530fb0 (patch) | |
| tree | 8c4f7c34f226d525f996fcd686ef41e05a050556 | |
| parent | 0f70354165958e8ab775ee96657156c81a787340 (diff) | |
Merge Upstream up to 11848
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11849 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | appendices/dependencies.xml | 2 | ||||
| -rw-r--r-- | chapter06/libcap.xml | 2 | ||||
| -rw-r--r-- | lfs-latest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 6f510a73e..d46acf603 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -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> diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml index 74704650d..8126dfaae 100644 --- a/chapter06/libcap.xml +++ b/chapter06/libcap.xml @@ -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 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\.]+).*$/" ); |