Changeset 5e8edab5 for general/prog


Ignore:
Timestamp:
05/24/2019 02:26:17 AM (5 years ago)
Author:
DJ Lucas <dj@…>
Branches:
elogind
Children:
8eebfaa5
Parents:
215c728b
Message:

Merge to HEAD 21618.

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

Location:
general/prog
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • general/prog/dbus-python.xml

    r215c728b r5e8edab5  
    118118<screen><userinput>mkdir python2 &amp;&amp;
    119119pushd python2 &amp;&amp;
    120 PYTHON=/usr/bin/python     \
     120PYTHON=/usr/bin/python2     \
    121121../configure --prefix=/usr --docdir=/usr/share/doc/dbus-python-&dbus-python-version; &amp;&amp;
    122122make &amp;&amp;

  • general/prog/doxygen.xml

    r215c728b r5e8edab5  
    150150    </para>
    151151
    152 <screen><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
     152<screen remap="doc"><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
    153153
    154154make docs</userinput></screen>

  • general/prog/gdb.xml

    r215c728b r5e8edab5  
    120120    </para>
    121121
    122 <screen><userinput>make -C gdb/doc doxy</userinput></screen>
     122<screen remap="doc"><userinput>make -C gdb/doc doxy</userinput></screen>
    123123
    124124    <para>
    … …  
    126126    </para>
    127127
    128 <screen><userinput>pushd gdb/testsuite &amp;&amp;
     128<screen remap="test"><userinput>pushd gdb/testsuite &amp;&amp;
    129129make  site.exp      &amp;&amp;
    130130echo  "set gdb_test_timeout 120" &gt;&gt; site.exp &amp;&amp;
    … …  
    205205    </para>
    206206
    207 <screen role="root"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
     207<screen role="root"
     208        remap="doc"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
    208209rm -rf gdb/doc/doxy/xml &amp;&amp;
    209210cp -Rv gdb/doc/doxy /usr/share/doc/gdb-&gdb-version;</userinput></screen>

  • general/prog/git.xml

    r215c728b r5e8edab5  
    165165    </para>
    166166
    167 <screen><userinput>make html</userinput></screen>
     167<screen remap="doc"><userinput>make html</userinput></screen>
    168168
    169169    <para>
    … …  
    172172    </para>
    173173
    174 <screen><userinput>make man</userinput></screen>
     174<screen remap="doc"><userinput>make man</userinput></screen>
    175175
    176176    <para>
    … …  
    195195    </para>
    196196
    197 <screen role="root"><userinput>make install-man</userinput></screen>
     197<screen role="root" remap="doc"><userinput>make install-man</userinput></screen>
    198198
    199199    <para>
    … …  
    202202    </para>
    203203
    204 <screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
     204<screen role="root" remap="doc"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
    205205
    206206<!-- ==== Method 2 for docs ====== -->

  • general/prog/jinja2.xml

    r215c728b r5e8edab5  
    9797      </para>
    9898
    99 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
     99<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
    100100
    101101      <para>

  • general/prog/libxml2py2.xml

    r215c728b r5e8edab5  
    9999
    100100<screen><userinput>cd python             &amp;&amp;
    101 python setup.py build</userinput></screen>
     101python2 setup.py build</userinput></screen>
    102102
    103103      <para>
    … …  
    107107      </para>
    108108
    109 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
     109<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
    110110
    111111    </sect3>

  • general/prog/llvm.xml

    r215c728b r5e8edab5  
    211211
    212212    <para>
     213      If you have installed <application>Sphinx</application> and
     214      <application>recommonmark</application> and wish
     215      to generate the html documentation and manual pages, issue the following
     216      commands:
     217    </para>
     218
     219<screen remap="doc"><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
     220      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
     221      -Wno-dev -G Ninja ..            &amp;&amp;
     222ninja docs-llvm-html  docs-llvm-man</userinput></screen>
     223
     224    <para>
     225      If you have downloaded the optional packages, the clang documentation
     226      can be built too:
     227    </para>
     228
     229<screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
     230
     231    <para>
    213232      <!-- EDITORS - if you have more than 4 cores, take some offline to measure
    214233      the elapsed time for the tests.  Also, libstdc++.a and perhaps libstdc++fs.a
    … …  
    234253
    235254    <para>
    236       If you have installed <application>Sphinx</application> and
    237       <application>recommonmark</application> and wish
    238       to generate the html documentation and manual pages, issue the following
    239       commands:
    240     </para>
    241 <screen><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
    242       -DSPHINX_WARNINGS_AS_ERRORS=OFF \
    243       -Wno-dev -G Ninja ..            &amp;&amp;
    244 ninja docs-llvm-html  docs-llvm-man</userinput></screen>
    245     <para>
    246       If you have downloaded the optional packages, the clang documentation
    247       can be built too:
    248     </para>
    249 <screen><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
    250 
    251     <para>
    252       Install the llvm documentation by running the following command as the
    253       <systemitem class="username">root</systemitem> user:
    254     </para>
    255 
    256 <screen role="root"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
     255      If you have built the the llvm documentation, install it by running the
     256      following commands as the <systemitem class="username">root</systemitem>
     257      user:
     258    </para>
     259
     260<screen role="root"
     261        remap="doc"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
    257262install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/llvm-html     &amp;&amp;
    258263cp -Rv docs/html/* /usr/share/doc/llvm-&llvm-version;/llvm-html</userinput></screen>
    259264
    260265    <para>
    261       The clang documentation can be installed in the same way (again as the
     266      If you have built the clang documentation, it can be installed in the
     267      same way (again as the
    262268      <systemitem class="username">root</systemitem> user):
    263269    </para>
    264270
    265 <screen role="root"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
     271<screen role="root"
     272        remap="doc"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
    266273install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/clang-html    &amp;&amp;
    267274cp -Rv tools/clang/docs/html/* /usr/share/doc/llvm-&llvm-version;/clang-html</userinput></screen>

  • general/prog/lxml.xml

    r215c728b r5e8edab5  
    105105
    106106      <para>
    107         To build the <application>Python 2</application> module, run:
     107        To build both <application>Python 2</application> and
     108        <application>Python 3</application> modules, run:
    108109      </para>
    109110
    110 <screen><userinput>python setup.py build</userinput></screen>
     111<screen><userinput>python2 setup.py build &amp;&amp;
     112python3 setup.py build</userinput></screen>
    111113
    112114     <para>
    113        If you wish to run the tests, enter: <command>make test</command>.
     115       If you wish to run the tests, enter:
     116       <command>make PYTHON=python2 test</command> and
     117       <command>make PYTHON=python3 test</command>.
    114118       This will rebuild the package for inplace use before running the tests.
    115119       One or more tests sometimes fail.
    … …  
    117121
    118122      <para>
    119         To install the <application>Python 2</application> module,
    120         as the
    121         <systemitem class="username">root</systemitem> user run:
     123        To install both modules, issue the following commands as the
     124        <systemitem class="username">root</systemitem> user:
    122125      </para>
    123126
    124 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    125 
    126       <para>
    127         To build the <application>Python 3</application> module, run:
    128       </para>
    129 
    130 <screen><userinput>python3 setup.py clean &amp;&amp;
    131 python3 setup.py build</userinput></screen>
    132 
    133      <para>
    134        If you wish to run the tests, enter: <command>make PYTHON=python3
    135        test</command>. This will rebuild the package for inplace use before
    136        running the tests. One or more tests sometimes fail.
    137      </para>
    138 
    139       <para>
    140         To install the <application>Python 3</application> module,
    141         as the
    142         <systemitem class="username">root</systemitem> user run:
    143       </para>
    144 
    145 <screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     127<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     128python3 setup.py install --optimize=1</userinput></screen>
    146129
    147130    </sect3>

  • general/prog/mako.xml

    r215c728b r5e8edab5  
    9999      </para>
    100100
    101 <screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
     101<screen role="root"><userinput>python2 setup.py install - -optimize=1</userinput></screen>
    102102-->
    103103      <para>

  • general/prog/mercurial.xml

    r215c728b r5e8edab5  
    100100    issue:</para>
    101101
    102 <screen><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
     102<screen remap="doc"><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
    1031032to3-3.7 -w doc/hgmanpage.py            &amp;&amp;
    104104make doc</userinput></screen>
    … …  
    111111    issue:</para>
    112112
    113 <screen><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
     113<screen remap="test"><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
    114114<literal># Test Failures
    115115  test-gpg.t</literal>
    … …  
    119119      To run the test suite, issue:
    120120    </para>
    121 <screen><userinput>rm -rf tests/tmp &amp;&amp;
     121<screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
    122122TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" make check</userinput></screen>
    123123
    … …  
    130130    the tests that failed before:</para>
    131131
    132 <screen><userinput>pushd tests  &amp;&amp;
     132<screen remap="test"><userinput>pushd tests  &amp;&amp;
    133133  rm -rf tmp &amp;&amp;
    134134  ./run-tests.py --tmpdir tmp test-gpg.t
    … …  
    142142    or not. One test, test-https.t, is known to fail.</para>
    143143
    144     <para>An interesting switch is "- -time", which will generate at the end of
     144    <para>An interesting switch is "--time", which will generate at the end of
    145145    the test suite execution, a table with all executed tests and respective
    146146    start, end, user, system and real times. Notice that the switches may be
    … …  
    156156    command (as <systemitem class="username">root</systemitem>):</para>
    157157
    158 <screen role="root"><userinput>make PREFIX=/usr install-doc</userinput></screen>
     158<screen role="root"
     159        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
    159160
    160161    <para>After installed, two very quick and simple tests should run correctly.

  • general/prog/pycairo.xml

    r215c728b r5e8edab5  
    9595
    9696      <para>
    97         Install <application>PyCairo</application> for Python2 by running
    98         the following commands:
     97        Install <application>PyCairo</application> for Python2  and Python3 by
     98        running the following commands:
    9999      </para>
    100100
    101 <screen><userinput>python2 setup.py build</userinput></screen>
     101<screen><userinput>python2 setup.py build &amp;&amp;
     102python3 setup.py build</userinput></screen>
    102103
    103104      <para>
    … …  
    109110      </para>
    110111
    111 <screen role="root"><userinput>python2 setup.py install --optimize=1   &amp;&amp;
     112<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     113python3 setup.py install --optimize=1</userinput></screen>
     114<!-- Seems that install does the following too
    112115python2 setup.py install_pycairo_header &amp;&amp;
    113 python2 setup.py install_pkgconfig</userinput></screen>
    114 
    115       <para>
    116         Install <application>PyCairo</application> for Python3 by running
    117         the following commands:
    118       </para>
    119 
    120 <screen><userinput>python3 setup.py build</userinput></screen>
    121 
    122       <para>
    123         This package does not come with a test suite.
    124       </para>
    125 
    126       <para>
    127         Now, as the <systemitem class="username">root</systemitem> user:
    128       </para>
    129 
    130 <screen role="root"><userinput>python3 setup.py install --optimize=1   &amp;&amp;
    131 python3 setup.py install_pycairo_header &amp;&amp;
    132 python3 setup.py install_pkgconfig</userinput></screen>
     116python2 setup.py install_pkgconfig</userinput></screen>-->
    133117
    134118    </sect3>

  • general/prog/pycrypto.xml

    r215c728b r5e8edab5  
    9393
    9494      <para>
    95         To build the <application>Python 2</application> module,
    96         run the following command:
     95        To build the <application>Python 2</application> and
     96        <application>Python 3</application> modules, run the following commands:
    9797      </para>
    9898
    99 <screen><userinput>python setup.py build</userinput></screen>
     99<screen><userinput>python2 setup.py build &amp;&amp;
     100python3 setup.py build</userinput></screen>
    100101
    101102      <para>
    102         To install the <application>Python 2</application> module,
    103         run the following command as the
     103        To install both modules, run the following commands as the
    104104        <systemitem class="username">root</systemitem> user:
    105105      </para>
    106106
    107 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    108 
    109       <para>
    110         To build the <application>Python 3</application> module,
    111         run the following command:
    112       </para>
    113 
    114 <screen><userinput>python3 setup.py build</userinput></screen>
    115 
    116       <para>
    117         To install the <application>Python 3</application> module,
    118         run the following command as the
    119         <systemitem class="username">root</systemitem> user:
    120       </para>
    121 
    122 <screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     107<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     108python3 setup.py install --optimize=1</userinput></screen>
    123109
    124110    </sect3>
    … …  
    137123          </seg>
    138124          <seg>
    139             pycrypto-&pycrypto-version;-py2.7.egg-info and/or
    140             pycrypto-&pycrypto-version;-py3.6.egg-info
     125            pycrypto-&pycrypto-version;-py&python2-majorver;.egg-info and/or
     126            pycrypto-&pycrypto-version;-py&python3-majorver;.egg-info
    141127          </seg>
    142128          <seg>

  • general/prog/pyyaml.xml

    r215c728b r5e8edab5  
    9797
    9898      <para>
    99         To build the <application>Python 2</application> module,
    100         run the following command:
     99        To build both <application>Python 2</application> and
     100        <application>Python 3</application> modules,
     101        run the following commands:
    101102      </para>
    102103
    103 <screen><userinput>python setup.py build</userinput></screen>
     104<screen><userinput>python2 setup.py build &amp;&amp;
     105python3 setup.py build</userinput></screen>
    104106
    105107      <para>
    106         To install the <application>Python 2</application> module,
    107         run the following command as the
     108        To install both modules, run the following commands as the
    108109        <systemitem class="username">root</systemitem> user:
    109110      </para>
    110111
    111 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    112 
    113       <para>
    114         To build the <application>Python 3</application> module,
    115         run the following command:
    116       </para>
    117 
    118 <screen><userinput>python3 setup.py build</userinput></screen>
    119 
    120       <para>
    121         To install the <application>Python 3</application> module,
    122         run the following command as the
    123         <systemitem class="username">root</systemitem> user:
    124       </para>
    125 
    126 <screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     112<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     113python3 setup.py install --optimize=1</userinput></screen>
    127114
    128115    </sect3>

  • general/prog/rust.xml

    r215c728b r5e8edab5  
    185185    <para role="optional">
    186186      <xref linkend="gdb"/> (used by the testsuite if it is present) and
    187       <xref linkend="python2"/> (if gdb is present, it must have been built
    188       with Python 2 support to prevent some tests failing. Furthermore, another
    189       test fails if Python 2 is not present)
     187      <xref linkend="python2"/> (one test fails if Python 2 is not present)
    190188    </para>
    191189
    … …  
    301299      which need Thumb (ARM) compilers will fail, all in <filename
    302300      class="directory">ui/issues</filename> for issues 37131, 49851 and 50993.
    303       Occasionally a fourth test,
     301      If <xref linkend="python2"/> is not installed, a fourth test,
    304302      <filename>run-make-fulldeps/sysroot-crates-are-unstable</filename>
    305303      fails. If gdb has been installed, in some circumstances three tests in

  • general/prog/scour.xml

    r215c728b r5e8edab5  
    107107
    108108      <para>
    109         To build the <application>Python 2</application> module,
    110         run the following command:
     109        To build both <application>Python 2</application> and
     110        <application>Python 3</application> modules,
     111        run the following commands:
    111112      </para>
    112113
    113 <screen><userinput>python setup.py build</userinput></screen>
     114<screen><userinput>python2 setup.py build &amp;&amp;
     115python3 setup.py build</userinput></screen>
    114116
    115117      <para>
    116         To partially test the results, issue: <command>python testcss.py</command>.
     118        To partially test the results, issue: <command>python2 testcss.py</command>.
    117119        If you have installed <application>Six</application> you can run the main
    118         tests by issuing: <command>python testscour.py</command>.
     120        tests by issuing: <command>python2 testscour.py</command>.
    119121      </para>
    120122
    121123      <para>
    122         To install the <application>Python 2</application> module
    123         run the following command as the
     124        To install both modules, run the following command as the
    124125        <systemitem class="username">root</systemitem> user:
    125126      </para>
    126127
    127 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    128 
    129       <para>
    130         To build the <application>Python 3</application> module,
    131         run the following command:
    132       </para>
    133 
    134 <screen><userinput>python3 setup.py build</userinput></screen>
    135 
    136       <para>
    137         To install the <application>Python 3</application> module,
    138         run the following command as the
    139         <systemitem class="username">root</systemitem> user:
    140       </para>
    141 
    142 <screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     128<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     129python3 setup.py install --optimize=1</userinput></screen>
    143130
    144131    </sect3>

  • general/prog/six.xml

    r215c728b r5e8edab5  
    9090
    9191      <para>
    92         Install <application>six</application> for Python2 by running
    93         the following commands:
     92        Install <application>six</application> for Python 2 and Python 3
     93        by running the following commands:
    9494      </para>
    9595
    96 <screen><userinput>python2 setup.py build</userinput></screen>
     96<screen><userinput>python2 setup.py build &amp;&amp;
     97python3 setup.py build</userinput></screen>
    9798
    9899      <para>
    … …  
    104105      </para>
    105106
    106 <screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
    107 
    108       <para>
    109         Install <application>six</application> for Python3 by running
    110         the following commands:
    111       </para>
    112 
    113 <screen><userinput>python3 setup.py build</userinput></screen>
    114 
    115       <para>
    116         This package does not come with a test suite.
    117       </para>
    118 
    119       <para>
    120         Now, as the <systemitem class="username">root</systemitem> user:
    121       </para>
    122 
    123 <screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     107<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
     108python3 setup.py install --optimize=1</userinput></screen>
    124109
    125110    </sect3>
Note: See TracChangeset for help on using the changeset viewer.