Changeset ec288f7

Timestamp:

11/07/2022 02:58:45 PM (18 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

9721d3f0, cb37cb79

Parents:

4a91abc

Message:

Stop hard coding the python version

Location:

general

Files:

• genlib/brotli.xml (modified) (1 diff)
• genlib/libxml2.xml (modified) (1 diff)
• prog/python3.xml (modified) (1 diff)
• prog/scons.xml (modified) (1 diff)
• prog/scour.xml (modified) (1 diff)

general/genlib/brotli.xml

@@ -166 +166 @@
         <seg>
           /usr/include/brotli
-          /usr/lib/python3.10/site-packages/Brotli-&brotli-version;.dist-info
+          /usr/lib/python&python3-majorver;/site-packages/Brotli-&brotli-version;.dist-info
         </seg>
       </seglistitem>

general/genlib/libxml2.xml

@@ -112 +112 @@
   <sect2 role="installation">
     <title>Installation of libxml2</title>
-<!--  No longer needed with 2.10.2.
-    <para>
-      First, fix a problem recognizing Python-3.10:
-    </para>
-
-<screen><userinput>autoreconf -fiv</userinput></screen>
--->
+
     <para>
       Install <application>libxml2</application> by running the following

general/prog/python3.xml

@@ -65 +65 @@
          <xref linkend="graphviz"/> (after swig).
       </para>
+
+      <para>
+         The wheel module from LFS will also need to be reinstalled:
+         <ulink url="https://www.linuxfromscratch.org/lfs/view/development/chapter08/wheel.html"/>.
+      </para>
     </important>
 

general/prog/scons.xml

@@ -96 +96 @@
                          --optimize=1  &&
 
-mv -v /usr/lib/python3.10/site-packages/SCons-&scons-version;-py&python3-majorver;.egg/*.1 \
+mv -v /usr/lib/python&python3-majorver;/site-packages/SCons-&scons-version;-py&python3-majorver;.egg/*.1 \
       /usr/share/man/man1</userinput></screen>
 

general/prog/scour.xml

@@ -115 +115 @@
           </seg>
           <seg>
-            /usr/lib/python3.10/site-packages/scour and
-            /usr/lib/python3.10/site-packages/scour-&scour-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/scour and
+            /usr/lib/python&python3-majorver;/site-packages/scour-&scour-version;.dist-info
           </seg>
         </seglistitem>