Author: pierre
Date: Wed May 13 14:00:59 2020
New Revision: 11849

Log:
Merge Upstream up to 11848

Modified:
   branches/cross-chap5/appendices/dependencies.xml
   branches/cross-chap5/chapter06/libcap.xml
   branches/cross-chap5/lfs-latest.php

Modified: branches/cross-chap5/appendices/dependencies.xml
==============================================================================
--- branches/cross-chap5/appendices/dependencies.xml    Wed May 13 13:57:13 
2020        (r11848)
+++ branches/cross-chap5/appendices/dependencies.xml    Wed May 13 14:00:59 
2020        (r11849)
@@ -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>

Modified: branches/cross-chap5/chapter06/libcap.xml
==============================================================================
--- branches/cross-chap5/chapter06/libcap.xml   Wed May 13 13:57:13 2020        
(r11848)
+++ branches/cross-chap5/chapter06/libcap.xml   Wed May 13 14:00:59 2020        
(r11849)
@@ -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

Modified: branches/cross-chap5/lfs-latest.php
==============================================================================
--- branches/cross-chap5/lfs-latest.php Wed May 13 13:57:13 2020        (r11848)
+++ branches/cross-chap5/lfs-latest.php Wed May 13 14:00:59 2020        (r11849)
@@ -280,7 +280,7 @@
   }
 
   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\.]+).*$/" );
-- 
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to