Changeset 80321c6

Timestamp:

11/01/2023 04:10:59 PM (11 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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

Children:

5f8327e, d9dec9bd

Parents:

6b1661a (diff), 23d67d8 (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 branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

Files:

• appendices/dependencies.xml (modified) (6 diffs)
• chapter08/python.xml (modified) (2 diffs)
• chapter08/setuptools.xml (modified) (1 diff)

appendices/dependencies.xml

@@ -1502 +1502 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>MarkupSafe and Python</seg>
+          <seg>MarkupSafe, Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
@@ -2142 +2142 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Python</seg>
+          <seg>Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
@@ -2180 +2180 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Ninja and Python</seg>
+          <seg>Ninja, Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
@@ -2736 +2736 @@
 
       <segmentedlist id="sed-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Setuptools dependency info -->
+  <bridgehead renderas="sect2" id="setuptools-dep">Setuptools</bridgehead>
+
+      <segmentedlist id="setuptools-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python and Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Jinja2, MarkupSafe, and Meson</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -3217 +3255 @@
 
 <!-- Begin Wheel dependency info -->
-  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
+  <bridgehead renderas="sect2" id="wheel-dep">Wheel</bridgehead>
 
       <segmentedlist id="wheel-depends">
@@ -3244 +3282 @@
         <seglistitem>
           <seg>
-            <phrase revision='sysv'>None</phrase>
-            <phrase revision='systemd'>Jinja2</phrase>
+            Jinja2, MarkupSafe, Meson, and Setuptools
           </seg>
         </seglistitem>

chapter08/python.xml

@@ -49 +49 @@
             --enable-shared      \
             --with-system-expat  \
-            --with-system-ffi    \
             --enable-optimizations</userinput></screen>
 
@@ -62 +61 @@
        </listitem>
      </varlistentry>
-
-    <varlistentry>
-      <term><parameter>--with-system-ffi</parameter></term>
-      <listitem>
-        <para>This switch enables linking against the system version of
-        <filename class='libraryfile'>libffi.so</filename>.</para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry>

chapter08/setuptools.xml

@@ -58 +58 @@
       <seglistitem>
          <seg>
-            /usr/lib/python&python-minor;/site-packages/flit_core and
-            /usr/lib/python&python-minor;/site-packages/flit_core-&setuptools-version;.dist-info
+            /usr/lib/python&python-minor;/site-packages/_distutils_hack,
+            /usr/lib/python&python-minor;/site-packages/pkg_resources,
+            /usr/lib/python&python-minor;/site-packages/setuptools, and
+            /usr/lib/python&python-minor;/site-packages/setuptools-&setuptools-version;.dist-info
          </seg>
       </seglistitem>