Changeset 73d91ac for chapter02


Ignore:
Timestamp:
12/05/2023 05:12:55 AM (7 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/arm64
Children:
00de269
Parents:
6b6a1b9 (diff), dc8572f (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/arm64

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter02/hostreqs.xml

    r6b6a1b9 r73d91ac  
    5555    </listitem>
    5656
    57     <listitem>
    58       <para><emphasis role="strong">Coreutils-7.0</emphasis></para>
     57    <!-- In Coreutils-8.1 the nproc program is added.  -->
     58    <listitem>
     59      <para><emphasis role="strong">Coreutils-8.1</emphasis></para>
    5960    </listitem>
    6061
     
    7374
    7475    <listitem>
    75       <para><emphasis role="strong">GCC-5.1</emphasis> including the C++
     76      <!-- Pass 1 GCC FTBFS with GCC-5.1 because of
     77           https://gcc.gnu.org/PR65801. -->
     78      <para><emphasis role="strong">GCC-5.2</emphasis> including the C++
    7679      compiler, <command>g++</command> (Versions greater than &gcc-version; are
    7780      not recommended as they have not been tested). C and C++ standard
     
    217220}
    218221
    219 # Coreutils first because-sort needs Coreutils >= 7.0
    220 ver_check Coreutils      sort     7.0 || bail "--version-sort unsupported"
     222# Coreutils first because --version-sort needs Coreutils >= 7.0
     223ver_check Coreutils      sort     8.1 || bail "Coreutils too old, stop"
    221224ver_check Bash           bash     3.2
    222225ver_check Binutils       ld       2.13.1
     
    225228ver_check Findutils      find     4.2.31
    226229ver_check Gawk           gawk     4.0.1
    227 ver_check GCC            gcc      5.1
    228 ver_check "GCC (C++)"    g++      5.1
     230ver_check GCC            gcc      5.2
     231ver_check "GCC (C++)"    g++      5.2
    229232ver_check Grep           grep     2.5.1a
    230233ver_check Gzip           gzip     1.3.12
     
    258261then echo "OK:    g++ works";
    259262else echo "ERROR: g++ does NOT work"; fi
    260 rm -f a.out</literal>
     263rm -f a.out
     264
     265if [ "$(nproc)" = "" ]; then
     266   echo "ERROR: nproc is not available or it produces empty output"
     267else
     268   echo "OK: nproc reports $(nproc) logical cores are available"
     269fi</literal>
    261270EOF
    262271
Note: See TracChangeset for help on using the changeset viewer.