Changeset 7546d8b for chapter02

Timestamp:

11/21/2023 12:45:26 AM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

e49e2ea

Parents:

2df066c9 (diff), 01247ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

File:

• chapter02/hostreqs.xml (modified) (5 diffs)

chapter02/hostreqs.xml

@@ -65 +65 @@
     </listitem>
 
-    <listitem>
-      <para><emphasis role="strong">Coreutils-7.0</emphasis></para>
+    <!-- In Coreutils-8.1 the nproc program is added.  -->
+    <listitem>
+      <para><emphasis role="strong">Coreutils-8.1</emphasis></para>
     </listitem>
 
@@ -83 +84 @@
 
     <listitem>
-      <para><emphasis role="strong">GCC-5.1</emphasis> including the C++
+      <!-- Pass 1 GCC FTBFS with GCC-5.1 because of
+           https://gcc.gnu.org/PR65801. -->
+      <para><emphasis role="strong">GCC-5.2</emphasis> including the C++
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
       not recommended as they have not been tested). C and C++ standard
@@ -186 +189 @@
 }
 
-# Coreutils first because-sort needs Coreutils >= 7.0
-ver_check Coreutils      sort     7.0 || bail "--version-sort unsupported"
+# Coreutils first because --version-sort needs Coreutils >= 7.0
+ver_check Coreutils      sort     8.1 || bail "Coreutils too old, stop"
 ver_check Bash           bash     3.2
 ver_check Bc             bc       1.07.0
@@ -195 +198 @@
 ver_check Findutils      find     4.2.31
 ver_check Gawk           gawk     4.0.1
-ver_check GCC            gcc      5.1
-ver_check "GCC (C++)"    g++      5.1
+ver_check GCC            gcc      5.2
+ver_check "GCC (C++)"    g++      5.2
 ver_check Grep           grep     2.5.1a
 ver_check Gzip           gzip     1.3.12
@@ -223 +226 @@
 then echo "OK:    g++ works";
 else echo "ERROR: g++ does NOT work"; fi
-rm -f a.out</literal>
+rm -f a.out
+
+if [ "$(nproc)" = "" ]; then
+   echo "ERROR: nproc is not available or it produces empty output"
+else
+   echo "OK: nproc reports $(nproc) logical cores are available"
+fi</literal>
 EOF