Changeset cfa3be5


Ignore:
Timestamp:
01/21/2022 04:45:12 AM (12 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
d960243
Parents:
c4595c3 (diff), d141d67 (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
  • chapter01/changelog.xml

    rc4595c3 rcfa3be5  
    4141    -->
    4242    <listitem>
     43      <para>2022-01-20</para>
     44      <itemizedlist>
     45        <listitem>
     46          <para>[bdubbs] - Update to expat-2.4.3 (security fixes). Fixes
     47          <ulink url="&lfs-ticket-root;4984">#4984</ulink>.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[pierre] - Update to meson-0.61.1. Fixes
     51          <ulink url="&lfs-ticket-root;4985">#4985</ulink>.</para>
     52        </listitem>
     53      </itemizedlist>
     54    </listitem>
     55
     56    <listitem>
    4357      <para>2022-01-17</para>
    4458      <itemizedlist>
  • chapter03/patches.xml

    rc4595c3 rcfa3be5  
    8484      </listitem>
    8585    </varlistentry>
    86 
     86<!--
    8787    <varlistentry>
    8888      <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
     
    9292      </listitem>
    9393    </varlistentry>
    94 <!--
     94
    9595    <varlistentry>
    9696      <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>
  • chapter08/meson.xml

    rc4595c3 rcfa3be5  
    4848  <sect2 role="installation">
    4949    <title>Installation of Meson</title>
    50 
     50<!--
    5151    <para>First, apply a patch that fixes an issue identified upstream:</para>
    5252
    5353<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
     54-->
    5455    <para>Compile Meson with the following command:</para>
    55 
    5656
    5757<screen><userinput remap="make">python3 setup.py build</userinput></screen>
  • chapter08/stripping.xml

    rc4595c3 rcfa3be5  
    8888online_usrbin="bash find strip"
    8989online_usrlib="libbfd-&binutils-version;.so
    90                libhistory.so.&readline-version;
     90               libhistory.so.&readline-soversion;
    9191               libncursesw.so.&ncurses-version;
    9292               libm.so.6
    93                libreadline.so.&readline-version;
     93               libreadline.so.&readline-soversion;
    9494               libz.so.&zlib-version;
    9595               $(cd /usr/lib; find libnss*.so* -type f)"
  • packages.ent

    rc4595c3 rcfa3be5  
    164164<!ENTITY eudev-fin-sbu "0.2 SBU">
    165165
    166 <!ENTITY expat-version "2.4.2">
    167 <!ENTITY expat-size "440 KB">
     166<!ENTITY expat-version "2.4.3">
     167<!ENTITY expat-size "444 KB">
    168168<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
    169 <!ENTITY expat-md5 "b49e50792ddb35165bab41413238f66e">
     169<!ENTITY expat-md5 "b1137f030590b3f0c41c69c6cd68fa90">
    170170<!ENTITY expat-home "https://libexpat.github.io/">
    171171<!ENTITY expat-fin-du "13 MB">
     
    501501<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    502502
    503 <!ENTITY meson-version "0.61.0">
    504 <!ENTITY meson-size "1,961 KB">
     503<!ENTITY meson-version "0.61.1">
     504<!ENTITY meson-size "1,963 KB">
    505505<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    506 <!ENTITY meson-md5 "cfe9f5e8ef869ba498a6a84f291f0c74">
     506<!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
    507507<!ENTITY meson-home "https://mesonbuild.com">
    508508<!ENTITY meson-fin-du "40 MB">
     
    617617
    618618<!ENTITY readline-version "8.1.2">
     619<!ENTITY readline-soversion "8.1"><!-- used for stripping -->
    619620<!ENTITY readline-size "2,923 KB">
    620621<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
  • patches.ent

    rc4595c3 rcfa3be5  
    5959<!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
    6060<!ENTITY libpipeline-checks-patch-size "22 KB">
    61 -->
    6261
    6362<!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch">
     
    6564<!ENTITY meson-fix-patch-size "5.5 KB">
    6665
    67 <!--
    6866<!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
    6967<!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
Note: See TracChangeset for help on using the changeset viewer.