Changeset 7a72a22 for chapter02/hostreqs.xml

Timestamp:

11/13/2023 04:27:17 PM (8 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

798e18b

Parents:

1780e72 (diff), e07c419 (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 tag 'xry111/update-20231113' into trunk

There are some suspicious "nptl/tst-robust" test failures in Glibc, but
all other test results are clean. To be diagnosed...

And note that jhalfs needs an update to work with the merged parallelism
changes.

File:

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

chapter02/hostreqs.xml

@@ -55 +55 @@
     </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>
 
@@ -219 +220 @@
 }
 
-# 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 Binutils       ld       2.13.1
@@ -260 +261 @@
 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