Changeset 440647ab

Timestamp:

01/11/2019 08:34:09 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.4, 9.0, 9.1, bdubbs/svn, gimp3, 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, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

6878aa6

Parents:

227b44ff

Message:

Update to scons-3.0.3 and build scons with python3

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20946 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/scons.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/serf.xml (modified) (3 diffs)

general/prog/scons.xml

@@ -7 +7 @@
   <!ENTITY scons-download-http "&sourceforge-dl;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "1c99878d0eaf9b768b50721e913142d3">
-  <!ENTITY scons-size          "616 KB">
-  <!ENTITY scons-buildsize     "5.3 MB">
+  <!ENTITY scons-md5sum        "aebc976d65d034f83fd1b14e33f1d34b">
+  <!ENTITY scons-size          "636 KB">
+  <!ENTITY scons-buildsize     "12 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>
@@ -73 +73 @@
     <bridgehead renderas="sect3">SCons Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="docbook-xsl"/>,
-      <xref role="runtime" linkend="libxml2py2"/> and
-      <xref role="runtime" linkend="libxslt"/> (the
-       <application>Python2</application> modules can be invoked at
-       runtime if using the SCons Docbook tool)
+      <xref role="runtime" linkend="libxslt"/>
     </para>
 
@@ -100 +92 @@
     </para>
 
- <screen role="root"><userinput>python setup.py install --prefix=/usr  \
-                        --standard-lib \
-                        --optimize=1   \
-                        --install-data=/usr/share</userinput></screen>
+<screen role="root"><userinput>sed -i 's/env python/&amp;3/' script/*                 &amp;&amp;
+python3 setup.py install --prefix=/usr  \
+                         --standard-lib \
+                         --optimize=1   \
+                         --install-data=/usr/share &amp;&amp;
+rm /usr/bin/scons*.bat</userinput></screen>
 
   </sect2>
@@ -117 +111 @@
       <seglistitem>
         <seg>
-          scons, scons-&scons-version;, sconsign, sconsign-&scons-version;,
-          scons-time, and scons-time-&scons-version;
+          scons, scons-configure-cache, sconsign, and scons-time
         </seg>
         <seg>
@@ -124 +117 @@
         </seg>
         <seg>
-          /usr/lib/python&python2-majorver;/site-packages/SCons
+          /usr/lib/python&python3-majorver;/site-packages/SCons
         </seg>
       </seglistitem>
@@ -142 +135 @@
           <indexterm zone="scons scons-prog">
             <primary sortas="b-scons">scons</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scons-configure-cache">
+        <term><command>scons-configure-cache</command></term>
+        <listitem>
+          <para>
+            shows or converts the configuration of an
+            <application>SCons</application> cache directory.
+          </para>
+          <indexterm zone="scons scons-configure-cache">
+            <primary sortas="b-scons-configure-cache">scons-configure-cache</primary>
           </indexterm>
         </listitem>

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to scons-3.0.3. Adapt build for
+          Python 3. Same for serf. Fixes
+          <ulink url="&blfs-ticket-root;11408">#11408</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to subversion-1.11.1. Fixes
           <ulink url="&blfs-ticket-root;11540">#11540</ulink>.</para>

networking/netlibs/serf.xml

@@ -104 +104 @@
 sed -i "/Alias/s:install_static,::"         SConstruct &&
 sed -i "/  print/{s/print/print(/; s/$/)/}" SConstruct &&
+sed -i "/get_contents()/s/,/.decode()&/"    SConstruct &&
 
 scons PREFIX=/usr</userinput></screen>
@@ -116 +117 @@
 -->
 
+<!-- With Python 3, check.py is broken. It could be fixed, but since the
+     testsuite hangs anyway...
     <para>
       To test the results, issue: <command>scons check</command>.
       The tests currently will cause a hang.
-      <!--  with 8.1, tests hang for some reason. Look into this later. -->
+    </para>
+-->
+
+    <para>
+      This package does not come with a functional testsuite.
     </para>
 
@@ -136 +143 @@
       <command>sed -i "..."</command>: The first command removes the runtime
       path from a shared library and the next two commands disable building and
-      installing of the static library.  The last command corrects for 
-      changes in scons-3.x.
+      installing of the static library.  The fourth command corrects for 
+      changes in scons-3.x. The last command allows to use <application>
+      Python 3</application>.
     </para>