Changeset fcd909d


Ignore:
Timestamp:
04/18/2022 03:15:36 PM (2 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
b1df1d7
Parents:
b826273 (diff), 4b51d83b (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:

Merge branch 'trunk' into xry111/clfs-ng

Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    rb826273 rfcd909d  
    30793079      </segmentedlist>
    30803080
     3081<!-- Begin Wheel dependency info -->
     3082  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
     3083
     3084      <segmentedlist id="wheel-depends">
     3085        <segtitle>&dependencies;</segtitle>
     3086        <seglistitem>
     3087          <seg>Python</seg>
     3088        </seglistitem>
     3089      </segmentedlist>
     3090
     3091      <segmentedlist id="wheel-rundeps">
     3092        <segtitle>&runtime;</segtitle>
     3093        <seglistitem>
     3094          <seg>Python</seg>
     3095        </seglistitem>
     3096      </segmentedlist>
     3097
     3098      <segmentedlist id="wheel-testdeps">
     3099        <segtitle>&testsuites;</segtitle>
     3100        <seglistitem>
     3101          <seg>No test suite available</seg>
     3102        </seglistitem>
     3103      </segmentedlist>
     3104
     3105      <segmentedlist id="wheel-before">
     3106        <segtitle>&before;</segtitle>
     3107        <seglistitem>
     3108          <seg>Jinja2</seg>
     3109        </seglistitem>
     3110      </segmentedlist>
     3111
     3112      <segmentedlist id="wheel-optdeps">
     3113        <segtitle>&external;</segtitle>
     3114        <seglistitem>
     3115          <seg>None</seg>
     3116        </seglistitem>
     3117      </segmentedlist>
     3118
    30813119<!-- Begin XML::Parser dependency info -->
    30823120  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>

  • chapter01/changelog.xml

    rb826273 rfcd909d  
    4545      <itemizedlist>
    4646        <listitem>
     47           <para>[bdubbs] - Add wheel-0.37.1 (Python module).</para>
     48        </listitem>
     49      </itemizedlist>
     50    </listitem>
     51
     52    <listitem>
     53      <para>2022-04-15</para>
     54      <itemizedlist>
     55        <listitem>
    4756          <para>[ken] - Patch Xz for a security fix.  Fixes
    4857          <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>

  • chapter01/whatsnew.xml

    rb826273 rfcd909d  
    282282    <listitem><para></para></listitem>  <!-- satisfy build -->
    283283    <listitem>
     284      <para>Wheel-&wheel-version;</para>
     285    </listitem>
     286    <listitem>
    284287      <para>&xz-upstream-fix-patch;</para>
    285288    </listitem>

  • chapter03/packages.xml

    rb826273 rfcd909d  
    786786
    787787    <varlistentry>
     788      <term>Wheel (&wheel-version;) - <token>&wheel-size;</token>:</term>
     789      <listitem>
     790        <para>Home page: <ulink url="&wheel-home;"/></para>
     791        <para>Download: <ulink url="&wheel-url;"/></para>
     792        <para>MD5 sum: <literal>&wheel-md5;</literal></para>
     793      </listitem>
     794    </varlistentry>
     795
     796    <varlistentry>
    788797      <term>XML::Parser (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
    789798      <listitem>

  • chapter08/chapter08.xml

    rb826273 rfcd909d  
    6464  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
     66  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wheel.xml"/>
    6667  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
    6768  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>

  • chapter08/jinja2.xml

    rb826273 rfcd909d  
    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

    rb826273 rfcd909d  
    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

    rb826273 rfcd909d  
    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

    rb826273 rfcd909d  
    9292
    9393<screen><userinput remap="install">make install</userinput></screen>
     94
     95    <para>In serveral places we use the <command>pip3</command> command to
     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>
     107
     108<screen><userinput remap="install">sed -e '/def warn_if_run_as_root/a\    return' \
     109    -i /usr/lib/python3.10/site-packages/pip/_internal/cli/req_command.py
     110</userinput></screen>
     111
    94112
    95113    <para>If desired, install the preformatted documentation:</para>

  • packages.ent

    rb826273 rfcd909d  
    740740<!ENTITY vim-fin-sbu "2.4 SBU">
    741741
     742<!-- From https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2/wheel-0.37.1.tar.gz -->
     743<!ENTITY wheel-version "0.37.1">
     744<!ENTITY wheel-size "65 KB">
     745<!ENTITY wheel-url "&anduin-sources;/wheel-&wheel-version;.tar.gz">
     746<!ENTITY wheel-md5 "f490f1399e5903706cb1d4fbed9ecb28">
     747<!ENTITY wheel-home "https://pypi.org/project/wheel/">
     748<!ENTITY wheel-fin-du "268 KB">
     749<!ENTITY wheel-fin-sbu "less than 0.1 SBU">
     750
    742751<!ENTITY xml-parser-version "2.46">
    743752<!ENTITY xml-parser-size "249 KB">

  • prologue/why.xml

    rb826273 rfcd909d  
    594594
    595595      <listitem>
     596        <para>Wheel</para>
     597
     598        <para>This package contains a Python module that is the
     599        reference implementation of the Python wheel packaging standard.
     600        </para>
     601      </listitem>
     602
     603      <listitem>
    596604        <para>Vim</para>
    597605
Note: See TracChangeset for help on using the changeset viewer.