Changeset d0331db


Ignore:
Timestamp:
01/23/2019 01:08:32 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 8.4, 9.0, 9.1, bdubbs/svn, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
4f4ed69
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:
3 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libbytesize.xml

    r6bcd464 rd0331db  
    8282      <xref linkend="gtk-doc"/>,
    8383      <xref linkend="python2"/>,
    84       <xref linkend="six"/> (python module for tests),
     84      <xref linkend="six"/> (needed for tests and python bindings),
    8585      <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and
    8686      <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
     
    106106    <para>
    107107      If you have the optional python modules installed, the regression
    108       tests can be run with: <command>make check</command>.
     108      tests can be run with: <command>make check</command>. If only
     109      <application>Python 3</application> is installed, one test has to be
     110      fixed with <command>
     111      sed -i 's/python/&amp;3/' tests/lbs_py_override_unittest.py</command>.
     112      <phrase revision='sysv'>Another test needs to be fixed if systemd
     113      is not installed, with:<command>
     114      sed -i '/busctl/s/=.*$/=lfs/' tests/canary_tests.sh</command>.</phrase>
    109115    </para>
    110116
     
    121127
    122128    <para>
    123       <option>--with-python3</option>: Use this switch to prefer Python 3 if
    124       both Python 2 and Python 3 are installed.
     129      <option>--without-python2</option>: If
     130      <application>Python 2</application> is installed, use this switch to
     131      prevent the use of <application>Python 2</application>. This may be
     132      required to run the tests, if some of the needed python modules have been
     133      installed for <application>Python 3</application> only.
    125134    </para>
    126135  </sect2>
  • general/prog/scour.xml

    r6bcd464 rd0331db  
    6969      <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
    7070
    71       <!-- Required: only setuptools, which is available from our Python and
    72       Python3 installs via pypi (it has a recursive dependency) -->
     71      <bridgehead renderas="sect5">Required</bridgehead>
     72      <para role="required">
     73        <xref linkend="six"/> (will be automatically downloaded and installed
     74        if not already present)
     75      </para>
    7376
    7477      <bridgehead renderas="sect5">Recommended</bridgehead>
     
    8386        </para>
    8487      </note>
    85 
    86       <bridgehead renderas="sect5">Optional (for the main test)</bridgehead>
    87       <para role="optional">
    88         <xref linkend="six"/>
    89       </para>
    9088
    9189      <para condition="html" role="usernotes">
  • introduction/welcome/changelog.xml

    r6bcd464 rd0331db  
    4545      <para>January 23rd, 2018</para>
    4646      <itemizedlist>
     47        <listitem>
     48          <para>[pierre] - Six is required for scour and will be downloaded
     49          automatically if not already installed.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[pierre] - Update instructions for libbytesize to allow
     53          building and testing without Python 2.</para>
     54        </listitem>
    4755        <listitem>
    4856          <para>[ken] - Change the 'Caution' on the rustc page (about running
Note: See TracChangeset for help on using the changeset viewer.