Changeset cd77c31


Ignore:
Timestamp:
04/19/2022 03:45:10 AM (2 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
20d3801
Parents:
644d5e0 (diff), 18e99c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • chapter08/jinja2.xml

    r644d5e0 rcd77c31  
    4141    <title>Installation of Jinja2</title>
    4242
     43    <para>Build the package:</para>
     44
     45<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
     46
    4347    <para>Install the package:</para>
    4448
    45 <screen><userinput remap="install">python3 setup.py install --optimize=1</userinput></screen>
     49<screen><userinput remap="install">pip3 install --no-index --find-links dist Jinja2</userinput></screen>
    4650
    4751  </sect2>
    … …  
    5155
    5256    <segmentedlist>
    53       <segtitle>Installed directories</segtitle>
     57      <segtitle>Installed directory</segtitle>
    5458
    5559      <seglistitem>
    56         <seg>/usr/lib/python&python-minor;/site-packages/Jinja2-&jinja2-version;-py&python-minor;.egg</seg>
     60         <seg>
     61            /usr/lib/python&python-minor;/site-packages/Jinja2-&jinja2-version;.dist-info
     62         </seg>
    5763      </seglistitem>
    5864    </segmentedlist>

  • chapter08/markupsafe.xml

    r644d5e0 rcd77c31  
    4343    <para>Compile MarkupSafe with the following command:</para>
    4444
    45 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
     45<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
    4646
    4747    <para>This package does not come with a test suite.</para>
    … …  
    4949    <para>Install the package:</para>
    5050
    51 <screen><userinput remap="install">python3 setup.py install --optimize=1</userinput></screen>
     51<screen><userinput remap="install">pip3 install --no-index --find-links dist Markupsafe</userinput></screen>
    5252
    5353  </sect2>
    … …  
    6060
    6161      <seglistitem>
    62         <!-- Suffix "-linux-<arch>" is different from meson and jinja:
    63              This package contains binary code (compiled from C), but meson
    64              and jinja only contain Python code.  -->
    65         <seg>/usr/lib/python&python-minor;/site-packages/MarkupSafe-&markupsafe-version;-py&python-minor;-linux-<replaceable>&lt;arch&gt;</replaceable>.egg</seg>
     62        <seg>
     63           /usr/lib/python&python-minor;/site-packages/MarkupSafe-&markupsafe-version;.dist-info
     64        </seg>
    6665      </seglistitem>
    6766    </segmentedlist>

  • chapter08/meson.xml

    r644d5e0 rcd77c31  
    5555    <para>Compile Meson with the following command:</para>
    5656
    57 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
     57<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
    5858
    5959    <para>The test suite requires some packages out of the scope of LFS.</para>
    … …  
    6161    <para>Install the package:</para>
    6262
    63 <screen><userinput remap="install">python3 setup.py install --root=dest
    64 cp -rv dest/* /
     63<screen><userinput remap="install">pip3 install --no-index --find-links dist meson
    6564install -vDm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson
    6665install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson</userinput></screen>
    … …  
    7069
    7170      <varlistentry>
    72         <term><parameter>--root=dest</parameter></term>
     71        <term><parameter>-w dist</parameter></term>
    7372        <listitem>
    74           <para>By default <command>python3 setup.py install</command>
    75           installs various files (such as man pages) into Python Eggs.
    76           With a specified root location, <command>setup.py</command> installs
    77           these files into a standard hierarchy.  Then the hierarchy
    78           can just be copied to the standard location.
    79         </para>
     73           <para>Put the created wheels into the
     74           <filename class='directory'>dist</filename> directory.</para>
     75        </listitem>
     76      </varlistentry>
     77
     78      <varlistentry>
     79        <term><parameter>--find-links dist</parameter></term>
     80        <listitem>
     81           <para>Install wheels from the
     82           <filename class='directory'>dist</filename> directory.</para>
    8083        </listitem>
    8184      </varlistentry>
    … …  
    9396      <seglistitem>
    9497        <seg>meson</seg>
    95         <!-- We are using DESTDIR installation here, so the directory layout
    96           is different than other Python modules in LFS
    97           (Jinja2 & MarkupSafe). -->
    98         <seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg-info and /usr/lib/python&python-minor;/site-packages/mesonbuild</seg>
     98        <seg>
     99           /usr/lib/python&python-minor;/site-packages/meson-&meson-version;.dist-info and
     100           /usr/lib/python&python-minor;/site-packages/mesonbuild
     101        </seg>
    99102      </seglistitem>
    100103    </segmentedlist>

  • chapter08/python.xml

    r644d5e0 rcd77c31  
    9494
    9595    <para>In serveral places we use the <command>pip3</command> command to
    96     install Python 3 programs and modules for all users as root. This conflicts
    97     with the Python developers recommendation to build packages in a virtual
    98     environment as a regular user. To this end, a multi-line warning is
    99     written when using <command>pip3</command> as the root user.  If desired,
    100     supress this warning by running the following command:</para>
     96    install Python 3 programs and modules for all users as
     97    <systemitem class='username'>root</systemitem>. This conflicts
     98    with the Python developers recommendation to install packages into a
     99    virtual environment or the home directory of a regular user (by running
     100    <command>pip3</command> as this user). To this end, a multi-line warning
     101    is written when using <command>pip3</command> as the
     102    <systemitem class='username'>root</systemitem> user.  The main reason
     103    of this recommendation is for avoiding a conflict with the system
     104    package manager (<command>dpkg</command> for example), but LFS does not
     105    have a system-wide package manager so this is not a problem.  If desired,
     106    suppress this warning by running the following command:</para>
    101107
    102108<screen><userinput remap="install">sed -e '/def warn_if_run_as_root/a\    return' \

  • chapter08/wheel.xml

    r644d5e0 rcd77c31  
    1515  </sect1info>
    1616
    17   <title>wheel-&wheel-version;</title>
     17  <title>Wheel-&wheel-version;</title>
    1818
    1919  <indexterm zone="ch-system-wheel">
    … …  
    2424    <title/>
    2525
    26     <para>Wheel is a Python library that implements the reference
     26    <para>Wheel is a Python library that is the reference
    2727    implementation of the Python wheel packaging standard.</para>
    2828
    … …  
    5151        <term><command>install</command></term>
    5252        <listitem>
    53            <para>Install the package</para>
     53           <para>Install the package.</para>
    5454        </listitem>
    5555      </varlistentry>
    … …  
    8080
    8181    <segmentedlist>
    82       <segtitle>Installed module</segtitle>
     82      <segtitle>Installed program</segtitle>
    8383      <segtitle>Installed directory</segtitle>
    8484
    8585      <seglistitem>
    86         <seg>wheel.py</seg>
     86        <seg>wheel</seg>
    8787        <seg>/usr/lib/python&python-minor;/site-packages/wheel</seg>
    8888      </seglistitem>
     89    </segmentedlist>
    8990
    90     </segmentedlist>
     91    <variablelist>
     92      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     93      <?dbfo list-presentation="list"?>
     94      <?dbhtml list-presentation="table"?>
     95
     96      <varlistentry id="wheel-wheel">
     97        <term><command>wheel</command></term>
     98        <listitem>
     99          <para>
     100            is an utility to unpack, pack, or convert wheel packages
     101          </para>
     102          <indexterm zone="ch-system-wheel">
     103            <primary sortas="b-wheel">wheel</primary>
     104          </indexterm>
     105        </listitem>
     106      </varlistentry>
     107    </variablelist>
    91108
    92109  </sect2>

  • lfs-latest-git.php

    r644d5e0 rcd77c31  
    138138if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
    139139if ( $package == "vim"        ) $dirpath = "https://github.com/vim/vim/tags";
     140if ( $package == "wheel"      ) $dirpath = "https://pypi.org/project/wheel/#files";
    140141if ( $package == "zstd"       ) $dirpath = "https://github.com/facebook/zstd/releases";
    141142
Note: See TracChangeset for help on using the changeset viewer.