Author: pierre
Date: Fri Jan 11 12:34:09 2019
New Revision: 20946
Log:
Update to scons-3.0.3 and build scons with python3
Modified:
trunk/BOOK/general/prog/scons.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/networking/netlibs/serf.xml
Modified: trunk/BOOK/general/prog/scons.xml
==============================================================================
--- trunk/BOOK/general/prog/scons.xml Fri Jan 11 09:55:56 2019 (r20945)
+++ trunk/BOOK/general/prog/scons.xml Fri Jan 11 12:34:09 2019 (r20946)
@@ -6,9 +6,9 @@
<!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">
]>
@@ -72,18 +72,10 @@
<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>
<para condition="html" role="usernotes">
@@ -99,10 +91,12 @@
commands as the <systemitem class="username">root</systemitem> user:
</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/&3/' script/*
&&
+python3 setup.py install --prefix=/usr \
+ --standard-lib \
+ --optimize=1 \
+ --install-data=/usr/share &&
+rm /usr/bin/scons*.bat</userinput></screen>
</sect2>
@@ -116,14 +110,13 @@
<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>
None
</seg>
<seg>
- /usr/lib/python&python2-majorver;/site-packages/SCons
+ /usr/lib/python&python3-majorver;/site-packages/SCons
</seg>
</seglistitem>
</segmentedlist>
@@ -144,6 +137,19 @@
</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>
+ </varlistentry>
<varlistentry id="sconsign">
<term><command>sconsign</command></term>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Jan 11 09:55:56
2019 (r20945)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Jan 11 12:34:09
2019 (r20946)
@@ -46,6 +46,11 @@
<para>January 11th, 2019</para>
<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>
</listitem>
Modified: trunk/BOOK/networking/netlibs/serf.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/serf.xml Fri Jan 11 09:55:56 2019
(r20945)
+++ trunk/BOOK/networking/netlibs/serf.xml Fri Jan 11 12:34:09 2019
(r20946)
@@ -103,6 +103,7 @@
sed -i "/Default/s:lib_static,::" SConstruct &&
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>
@@ -115,10 +116,16 @@
-e 's://\( buf_size = orig_len + (orig_len / 1000) + 12;\):/\*\1\
*/:'</userinput></screen>
-->
+<!-- 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>
<para>
@@ -135,8 +142,9 @@
<para>
<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>
<para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
