Changeset 590d2559


Ignore:
Timestamp:
07/19/2021 12:54:58 PM (3 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
d072573
Parents:
ef613133 (diff), c522873 (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/tester-nohack

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    ref613133 r590d2559  
    24032403        <segtitle>&testsuites;</segtitle>
    24042404        <seglistitem>
    2405           <seg>Iana-Etc and Procps-ng</seg>
     2405          <seg>Iana-Etc, Less. and Procps-ng</seg>
    24062406        </seglistitem>
    24072407      </segmentedlist>

  • chapter01/changelog.xml

    ref613133 r590d2559  
    4444    -->
    4545    <listitem>
     46      <para>2021-07-17</para>
     47      <itemizedlist>
     48        <listitem>
     49          <para>[ken] - Fix test failures in perl-5.34.0 by building less before
     50          perl and by patching perl for a problem highlighted by gdbm-1.20. Fixes
     51          <ulink url="&lfs-ticket-root;4885">#4885</ulink>.</para>
     52        </listitem>
     53      </itemizedlist>
     54    </listitem>
     55
     56    <listitem>
     57      <para>2021-07-15</para>
     58      <itemizedlist>
     59        <listitem>
     60          <para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
     61        </listitem>
     62      </itemizedlist>
     63    </listitem>
     64
     65    <listitem>
    4666      <para>2021-07-08</para>
    4767      <itemizedlist>

  • chapter03/introduction.xml

    ref613133 r590d2559  
    2424  url="http://www.google.com/"/>) provides a useful search engine for
    2525  most packages. If this search is unsuccessful, try one of the
    26   alternative means of downloading discussed at <ulink
    27   url="&lfs-root;lfs/packages.html#packages"/>. </para>
     26  alternative means of downloading at <ulink
     27  url="&lfs-root;lfs/mirrors.html#files"/>. </para>
    2828
    2929  <para>Downloaded packages and patches will need to be stored somewhere

  • chapter03/patches.xml

    ref613133 r590d2559  
    103103    </varlistentry>
    104104-->
     105
     106    <varlistentry>
     107      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
     108      <listitem>
     109        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
     110        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
     111      </listitem>
     112    </varlistentry>
     113
    105114    <varlistentry revision="sysv">
    106115      <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>

  • chapter06/m4.xml

    ref613133 r590d2559  
    4343  <sect2 role="installation">
    4444    <title>Installation of M4</title>
    45 
     45<!--
    4646    <para>First, make some fixes introduced by glibc-2.28:</para>
    4747
    4848<screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
    4949echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
    50 
     50-->
    5151    <para>Prepare M4 for compilation:</para>
    5252

  • chapter08/bzip2.xml

    ref613133 r590d2559  
    9898done</userinput></screen>
    9999
    100     <para>Remove an useless static library:</para>
     100    <para>Remove a useless static library:</para>
    101101
    102102<screen><userinput remap="install">rm -fv /usr/lib/libbz2.a</userinput></screen>

  • chapter08/chapter08.xml

    ref613133 r590d2559  
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
     55  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
    5556  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
    5657  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
    … …  
    7273  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
    7374  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
    74   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
    7575  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
    7676  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>

  • chapter08/libtool.xml

    ref613133 r590d2559  
    7272              so we manually remove the static library -->
    7373
    74     <para>Remove an useless static library:</para>
     74    <para>Remove a useless static library:</para>
    7575
    7676<screen><userinput remap="install">rm -fv /usr/lib/libltdl.a</userinput></screen>

  • chapter08/m4.xml

    ref613133 r590d2559  
    4040  <sect2 role="installation">
    4141    <title>Installation of M4</title>
    42 
     42<!--
    4343    <para>First, make some fixes required by glibc-2.28 and later:</para>
    4444
    4545<screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
    4646echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
    47 
     47-->
    4848    <para>Prepare M4 for compilation:</para>
    4949

  • chapter08/perl.xml

    ref613133 r590d2559  
    4141  <sect2 role="installation">
    4242    <title>Installation of Perl</title>
     43
     44    <para>First, apply a patch that fixes an issue highlighted by recent
     45    versions of gdbm:</para>
     46
     47<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
    4348
    4449    <para>This version of Perl now builds the Compress::Raw::Zlib and

  • chapter08/util-linux.xml

    ref613133 r590d2559  
    9595<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
    9696    </warning>
     97
     98    <note><para>There is one test that depends on the configuration of the kernel.
     99    If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
     100    To work around the problem, delete one test:</para>
     101
     102    <screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>
     103    </note>
    97104
    98105<screen><userinput remap="test">chown -Rv tester .

  • chapter08/zlib.xml

    ref613133 r590d2559  
    5858<screen><userinput remap="install">make install</userinput></screen>
    5959
    60     <para>Remove an useless static library:</para>
     60    <para>Remove a useless static library:</para>
    6161
    6262<screen><userinput remap="install">rm -fv /usr/lib/libz.a</userinput></screen>

  • lfs-latest-git.php

    ref613133 r590d2559  
    128128if ( $package == "Python"     ) $dirpath = "https://www.python.org/downloads/source/";
    129129if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
     130if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/";
     131if ( $package == "Jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
    130132if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
    131133if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
    … …  
    281283     return find_max( $lines, "/grub/", "/^.*grub-([\d\.]+).tar.xz.*$/" );
    282284
     285  if ( $package == "Jinja" )
     286     return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" );
     287
    283288  if ( $package == "openssl" )
    284289     return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );

  • patches.ent

    ref613133 r590d2559  
    6464<!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
    6565-->
     66
     67<!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
     68<!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
     69<!ENTITY perl-fix-patch-size "1.6 KB">
     70
    6671<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
    6772<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
Note: See TracChangeset for help on using the changeset viewer.