Changeset c33354c for chapter08

Timestamp:

03/31/2023 10:30:12 PM (13 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

864c66d

Parents:

1c0bd90 (diff), fd531b84 (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:

• chapter08.xml (modified) (1 diff)
• coreutils.xml (modified) (1 diff)
• flit-core.xml (added)
• stripping.xml (modified) (1 diff)
• wheel.xml (modified) (2 diffs)

chapter08/chapter08.xml

@@ -65 +65 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flit-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wheel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>

chapter08/coreutils.xml

@@ -54 +54 @@
     </note>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
-   coreutils is released, please check #4055 to see if the change has been
-   picked up in this package -->
-<!--
-   <para>Now, fix a problem with chmod return values:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-chmod-patch;</userinput></screen>
--->
+    <!-- https://bugs.gnu.org/62403 -->
+    <para>Fix a bug in checksum utilities causing failed checks not
+    reported correctly:</para>
+
+<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 

chapter08/stripping.xml

@@ -55 +55 @@
   <important>
     <para>
-      If any package of which the version is different from the version
+      If there is any package whose version is different from the version
       specified by the book (either following a security advisory or
       satisfying personal preference), it may be necessary to update the
-      the library file name in <envar>save_usrlib</envar> or
+      library file name in <envar>save_usrlib</envar> or
       <envar>online_usrlib</envar>.
       <emphasis role='bold'>Failing to do so may render the system

chapter08/wheel.xml

@@ -43 +43 @@
     <para>Compile Wheel with the following command:</para>
 
-<screen><userinput remap="make">PYTHONPATH=src pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install Wheel with the following command:</para>
@@ -49 +49 @@
 <screen><userinput remap="install">pip3 install --no-index --find-links=dist wheel</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the pip3 configuration options and commands:</title>
-
-      <varlistentry>
-        <term><envar>PYTHONPATH=src</envar></term>
-        <listitem>
-           <para>Allows this package (not installed yet) to build a
-           wheel archive for itself, to avoid a chicken-or-egg problem.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>wheel</command></term>
-        <listitem>
-           <para>This command builds the wheel archive for this package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-w dist</parameter></term>
-        <listitem>
-           <para>Instructs pip to put the created wheel into the
-           <filename class='directory'>dist</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>install</command></term>
-        <listitem>
-           <para>This command installs the package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--no-build-isolation</parameter>,
-              <parameter>--no-deps</parameter>, and
-              <parameter>--no-index</parameter></term>
-        <listitem>
-          <para>These options prevent fetching files from the online package
-          repository (PyPI). If packages are installed in the correct order,
-          pip won't need to fetch any files in the first place; these
-          options add some safety in case of user error.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--find-links dist</parameter></term>
-        <listitem>
-           <para>Instructs pip to search for wheel archives in the
-           <filename class='directory'>dist</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
   </sect2>