Changeset 1cdea83

Timestamp:

09/05/2023 08:11:02 PM (9 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

a20b7c92

Parents:

8cc28db6

Message:

scons: Use pip3 wheel & pip3 install instead of setup.py

Also introduce entities for pip3 wheel and pip3 install for future use
(#18466). Reuse the entities for gpgme and libpwquality, so the missed
--no-user in libpwquality is fixed as well.

Files:

• general.ent (modified) (1 diff)
• general/prog/scons.xml (modified) (2 diffs)
• postlfs/security/gpgme.xml (modified) (1 diff)
• postlfs/security/libpwquality.xml (modified) (1 diff)

general.ent

@@ -204 +204 @@
 <!ENTITY qt5-deps
          "(<xref linkend='qt5'/> or <xref role='nodep' linkend='qt5-alternate'/>)">
+
+<!ENTITY build-wheel '<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir .</userinput></screen>'>
+
+<!ENTITY install-wheel 'pip3 install --no-index --find-links=dist --no-cache-dir --no-user'>

general/prog/scons.xml

@@ -80 +80 @@
     <title>Installation of SCons</title>
 
+    <!-- Commented out because I don't think it's still needed.  If
+         something bad happens please uncomment.
+    <screen><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py &amp;&amp;</userinput></screen> -->
+
     <para>
-      Install <application>SCons</application> by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
+      Fix the install location of the man pages:
     </para>
 
-<screen role="root"><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py &amp;&amp;
+    <screen><userinput>sed -i '/scons.1/s@^.@share/man/man1@' -i setup.cfg</userinput></screen>
 
-python3 setup.py install --prefix=/usr \
-                         --optimize=1  &amp;&amp;
+    <para>
+      Build the package:
+    </para>
 
-mv -v /usr/lib/python&python3-majorver;/site-packages/SCons-&scons-version;-py&python3-majorver;.egg/*.1 \
-      /usr/share/man/man1</userinput></screen>
+    &build-wheel;
 
+    <para>
+      As the &root; user, install the package:
+    </para>
+
+    <screen role='root'><userinput>&install-wheel; SCons</userinput></screen>
   </sect2>
 
@@ -111 +119 @@
         </seg>
         <seg>
-          /usr/lib/python&python3-majorver;/site-packages/SCons
+          /usr/lib/python&python3-majorver;/site-packages/SCons{,-&scons-version;.dist-info}
         </seg>
       </seglistitem>

postlfs/security/gpgme.xml

@@ -165 +165 @@
 
 <screen role="root"><userinput>if swig -version > /dev/null; then
-  pip3 install --no-index --find-links=dist --no-cache-dir --no-user gpg
+  &install-wheel; gpg
 fi</userinput></screen>
 

postlfs/security/libpwquality.xml

@@ -113 +113 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-pip3 install --no-index --find-links=dist --no-cache-dir pwquality</userinput></screen>
+&install-wheel; pwquality</userinput></screen>
 
   </sect2>