Changeset f1aad2eb

Timestamp:

05/13/2020 09:00:59 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

e14f0cb

Parents:

0f703541

Message:

Merge Upstream up to 11848

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11849 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter06/libcap.xml (modified) (1 diff)
• lfs-latest.php (modified) (1 diff)

appendices/dependencies.xml

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

chapter06/libcap.xml

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

lfs-latest.php

@@ -281 +281 @@
 
   if ( $package == "procps-ng" )
-     return find_max( $lines, "/release/", "/^.* ([\d\.]+).*$/" );
+     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).*$/" );
 
   if ( $package == "psmisc" )