Changeset d0331db

Timestamp:

01/23/2019 01:08:32 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:

4f4ed69b

Parents:

6bcd464

Message:

Fix libbytsize building and testing with only P3
Scour requires six

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

Files:

• general/genlib/libbytesize.xml (modified) (3 diffs)
• general/prog/scour.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genlib/libbytesize.xml

@@ -82 +82 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="python2"/>, 
-      <xref linkend="six"/> (python module for tests),
+      <xref linkend="six"/> (needed for tests and python bindings),
       <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and 
       <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
@@ -106 +106 @@
     <para>
       If you have the optional python modules installed, the regression 
-      tests can be run with: <command>make check</command>.
+      tests can be run with: <command>make check</command>. If only
+      <application>Python 3</application> is installed, one test has to be
+      fixed with <command>
+      sed -i 's/python/&amp;3/' tests/lbs_py_override_unittest.py</command>.
+      <phrase revision='sysv'>Another test needs to be fixed if systemd
+      is not installed, with:<command>
+      sed -i '/busctl/s/=.*$/=lfs/' tests/canary_tests.sh</command>.</phrase>
     </para>
 
@@ -121 +127 @@
 
     <para>
-      <option>--with-python3</option>: Use this switch to prefer Python 3 if
-      both Python 2 and Python 3 are installed.
+      <option>--without-python2</option>: If
+      <application>Python 2</application> is installed, use this switch to
+      prevent the use of <application>Python 2</application>. This may be
+      required to run the tests, if some of the needed python modules have been
+      installed for <application>Python 3</application> only.
     </para>
   </sect2>

general/prog/scour.xml

@@ -69 +69 @@
       <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
 
-      <!-- Required: only setuptools, which is available from our Python and
-      Python3 installs via pypi (it has a recursive dependency) -->
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="six"/> (will be automatically downloaded and installed
+        if not already present)
+      </para>
 
       <bridgehead renderas="sect5">Recommended</bridgehead>
@@ -83 +86 @@
         </para>
       </note>
-
-      <bridgehead renderas="sect5">Optional (for the main test)</bridgehead>
-      <para role="optional">
-        <xref linkend="six"/>
-      </para>
 
       <para condition="html" role="usernotes">

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 23rd, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Six is required for scour and will be downloaded
+          automatically if not already installed.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update instructions for libbytesize to allow
+          building and testing without Python 2.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Change the 'Caution' on the rustc page (about running