Changeset aebd449 for chapter08

Timestamp:

11/13/2023 11:30:18 PM (11 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

18d1f6f

Parents:

fbc1e90 (diff), e3ae067 (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:

Automatic merge of trunk into multilib

Location:

chapter08

Files:

• automake.xml (modified) (1 diff)
• openssl.xml (modified) (1 diff)
• perl.xml (modified) (1 diff)
• udev.xml (modified) (1 diff)

chapter08/automake.xml

@@ -54 +54 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para> Using the -j4 make option speeds up the tests, even on systems with
-    only one processor, due to internal delays in individual tests.  To test
+    <para>Using four parallel jobs speeds up the tests, even on systems with
+    less logical cores, due to internal delays in individual tests.  To test
     the results, issue:</para>
 
-<screen><userinput remap="test">make -j4 check</userinput></screen>
+<screen><userinput remap="test">make <replaceable>-j$(($(nproc)&gt;4?$(nproc):4))</replaceable> check</userinput></screen>
+
+    <para>Replace <replaceable>$((...))</replaceable> with the number of
+    logical cores you want to use if you don't want to use all.</para>
 
     <para>The test t/subobj.sh is known to fail.</para>

chapter08/openssl.xml

@@ -64 +64 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make test</userinput></screen>
+<screen><userinput remap="test">HARNESS_JOBS=<replaceable>$(nproc)</replaceable> make test</userinput></screen>
 
     <para>One test, 30-test_afalg.t, is known to fail if the host kernel

chapter08/perl.xml

@@ -112 +112 @@
     <para>To test the results (approximately 11 SBU), issue:</para>
 
-<screen><userinput remap="test">make test</userinput></screen>
+<screen><userinput remap="test">TEST_JOBS=$(nproc) make test_harness</userinput></screen>
 
     <para>Install the package and clean up:</para>

chapter08/udev.xml

@@ -140 +140 @@
 install -vm644 ../src/udev/udev.conf               /etc/udev/
 install -vm644 rules.d/* ../rules.d/README         /usr/lib/udev/rules.d/
-install -vm644 $(echo ../rules.d/*.rules | \
-                 sed 's/70-power-switch.rules//')  /usr/lib/udev/rules.d/
+install -vm644 $(find ../rules.d/*.rules \
+                      -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
-install -vm755 $(find src/udev -type f \
-                               -not -name '*.*')   /usr/lib/udev</userinput></screen>
+install -vm755 $(find src/udev \
+                      -type f -not -name '*.*')    /usr/lib/udev</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS