Changeset b1e9fd41


Ignore:
Timestamp:
12/25/2019 02:21:00 PM (4 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
3a41eec
Parents:
f0b6f13
Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11712 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    rf0b6f13 rb1e9fd41  
    350350
    351351        <seglistitem>
    352           <seg>None</seg>
     352          <seg>File</seg>
    353353        </seglistitem>
    354354      </segmentedlist>
    … …  
    692692
    693693        <seglistitem>
    694           <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
    695           Make, Sed, and Zlib</seg>
     694          <seg>Bash, Binutils, Bzip2, Coreutils, Diffutils, Gawk, GCC, Glibc,
     695          Grep, Make, Sed, Xz, and Zlib</seg>
    696696        </seglistitem>
    697697      </segmentedlist>
    … …  
    27172717
    27182718        <seglistitem>
    2719           <seg>Eudev, GRUB, Kmod, and Man-DB</seg>
     2719          <seg>Eudev, File, GRUB, Kmod, and Man-DB</seg>
    27202720        </seglistitem>
    27212721      </segmentedlist>

  • chapter01/changelog.xml

    rf0b6f13 rb1e9fd41  
    4646       -->
    4747    <listitem revision="sysv">
     48      <para>2019-12-22</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[pierre] - Update to python3-3.8.1. Fixes
     52          <ulink url="&lfs-ticket-root;4564">#4564</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[pierre] - Update to file-5.38. Fixes
     56          <ulink url="&lfs-ticket-root;4563">#4563</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[pierre] - Update to linux-5.4.6. Fixes
     60          <ulink url="&lfs-ticket-root;4562">#4562</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[pierre] - Update to vim-8.2.0024. Part of
     64          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
     65        </listitem>
     66      </itemizedlist>
     67    </listitem>
     68
     69    <listitem>
     70      <para>2019-12-12</para>
     71      <itemizedlist>
     72        <listitem>
     73          <para>[bdubbs] - Update to libcap-2.28. Fixes
     74          <ulink url="&lfs-ticket-root;4559">#4559</ulink>.</para>
     75        </listitem>
     76        <listitem>
     77          <para>[bdubbs] - Update to bison-3.5. Fixes
     78          <ulink url="&lfs-ticket-root;4561">#4561</ulink>.</para>
     79        </listitem>
     80      </itemizedlist>
     81    </listitem>
     82
     83    <listitem>
     84      <para>2019-12-10</para>
     85      <itemizedlist>
     86        <listitem>
     87          <para>[renodr] - Fix a regression in meson that was causing problems
     88          in dependent packages.</para>
     89        </listitem>
     90      </itemizedlist>
     91    </listitem>
     92
     93    <listitem>
    4894      <para>2019-12-05</para>
    4995      <itemizedlist>

  • chapter01/whatsnew.xml

    rf0b6f13 rb1e9fd41  
    8181      <para>Expect-&expect-version;</para>
    8282   </listitem>-->
    83    <!--<listitem>
     83   <listitem>
    8484      <para>File-&file-version;</para>
    85    </listitem>-->
     85   </listitem>
    8686    <listitem>
    8787      <para>Findutils-&findutils-version;</para>
    … …  
    147147      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
    148148    </listitem>-->
    149     <!--<listitem>
     149    <listitem>
    150150      <para>Libcap-&libcap-version;</para>
    151     </listitem>-->
     151    </listitem>
    152152    <listitem>
    153153      <para>Libelf-&elfutils-version; (from elfutils)</para>

  • chapter05/bzip2.xml

    rf0b6f13 rb1e9fd41  
    4545
    4646    <para>The Bzip2 package does not contain a <command>configure</command>
    47     script. Compile and test it with:</para>
     47    script. There are two <filename>Makefile</filename>, one for the shared
     48    library, and the other for the static library. Since we need both, We
     49    do the compilation in two stages. First the shared library:</para>
     50
     51<screen><userinput remap="make">make -f Makefile-libbz2_so
     52make clean</userinput></screen>
     53
     54    <variablelist>
     55      <title>The meaning of the make parameter:</title>
     56
     57      <varlistentry>
     58        <term><parameter>-f Makefile-libbz2_so</parameter></term>
     59        <listitem>
     60          <para>This will cause Bzip2 to be built using a different
     61          <filename>Makefile</filename> file, in this case the
     62          <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
     63          <filename class="libraryfile">libbz2.so</filename> library and links
     64          the Bzip2 utilities against it.</para>
     65        </listitem>
     66      </varlistentry>
     67
     68    </variablelist>
     69
     70    <para>Compile and test the package with:</para>
    4871
    4972<screen><userinput remap="make">make</userinput></screen>
    … …  
    5174    <para>Install the package:</para>
    5275
    53 <screen><userinput remap="install">make PREFIX=/tools install</userinput></screen>
     76<screen><userinput remap="install">make PREFIX=/tools install
     77cp -v bzip2-shared /tools/bin/bzip2
     78cp -av libbz2.so* /tools/lib
     79ln -sv libbz2.so.1.0 /tools/lib/libbz2.so</userinput></screen>
    5480
    5581  </sect2>

  • chapter06/bison.xml

    rf0b6f13 rb1e9fd41  
    4040  <sect2 role="installation">
    4141    <title>Installation of Bison</title>
    42 
     42<!--
    4343    <para>First, fix a build problem with the current version:</para>
    4444
    4545<screen><userinput remap="pre">sed -i '9327 s/mv/cp/' Makefile.in</userinput></screen>
    46 
     46-->
    4747    <para>Prepare Bison for compilation:</para>
    4848
    4949<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
    5050
     51<!--  I could not find a race condidtion in the current version.
    5152    <para>Compile the package, but work around a race condition in the
    5253    current version:</para>
    5354
    54 <screen><userinput remap="make">make -j1</userinput></screen>
     55<screen><userinput remap="make">make -j1</userinput></screen>-->
     56
     57    <para>Compile the package:</para>
     58
     59<screen><userinput remap="make">make</userinput></screen>
    5560
    5661<!--

  • chapter06/chapter06.xml

    rf0b6f13 rb1e9fd41  
    2727
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
     29  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
     30  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
    2931  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
    3032  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
    … …  
    4042  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
    4143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
    42   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    4344  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
    4445  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
    … …  
    6162  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
    6263  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
    63   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
    6464  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>

  • chapter06/meson.xml

    rf0b6f13 rb1e9fd41  
    4040  <sect2 role="installation">
    4141    <title>Installation of Meson</title>
     42
     43    <para>Apply a fix from upstream to fix a regression:</para>
     44
     45<screen><userinput remap="pre">sed -i "s@isfile(a)@&amp; and not a.startswith('/dev')@" mesonbuild/interpreter.py</userinput></screen>
    4246
    4347    <para>Compile Meson with the following command:</para>

  • general.ent

    rf0b6f13 rb1e9fd41  
    1 <!ENTITY version         "SVN-20191205">
     1<!ENTITY version         "SVN-20191222">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20191205-systemd">
     6<!ENTITY versiond        "20191222-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "December 5th, 2019">
     10<!ENTITY releasedate     "December 22nd, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    rf0b6f13 rb1e9fd41  
    1313<!ENTITY acl-home " ">
    1414<!ENTITY acl-ch6-du "6.4 MB">
    15 <!ENTITY acl-ch6-sbu "less than 0.1 SBU">
     15<!ENTITY acl-ch6-sbu "0.1 SBU">
    1616
    1717<!ENTITY attr-version "2.4.48">
    … …  
    6363<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
    6464<!ENTITY binutils-md5 "9406231b7d9dd93731c2d06cefe8aaf1">
    65 <!ENTITY binutils-home "&gnu-software;binutils/"><!ENTITY binutils-ch5p1-du "580 MB">
     65<!ENTITY binutils-home "&gnu-software;binutils/">
     66<!ENTITY binutils-ch5p1-du "659 MB">
    6667<!ENTITY binutils-ch5p1-sbu "1 SBU">
    67 <!ENTITY binutils-ch5p2-du "879 MB">
    68 <!ENTITY binutils-ch5p2-sbu "1.1 SBU">
     68<!ENTITY binutils-ch5p2-du "637 MB">
     69<!ENTITY binutils-ch5p2-sbu "1.2 SBU">
    6970<!ENTITY binutils-ch6-du "5.1 GB">
    70 <!ENTITY binutils-ch6-sbu "7.4 SBU">
    71 
    72 <!ENTITY bison-version "3.4.2">
    73 <!ENTITY bison-size "2,189 KB">
     71<!ENTITY binutils-ch6-sbu "7.2 SBU">
     72
     73<!ENTITY bison-version "3.5">
     74<!ENTITY bison-size "2,287 KB">
    7475<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
    75 <!ENTITY bison-md5 "d1ceb9dfde2d03b24a4c1137f7f1b572">
     76<!ENTITY bison-md5 "c0230be066069f33c8445766833f3205">
    7677<!ENTITY bison-home "&gnu-software;bison/">
    77 <!ENTITY bison-ch5-du "39 MB">
     78<!ENTITY bison-ch5-du "42 MB">
    7879<!ENTITY bison-ch5-sbu "0.3 SBU">
    7980<!ENTITY bison-ch6-du "39 MB">
    … …  
    8586<!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
    8687<!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
    87 <!ENTITY bzip2-ch5-du "6.0 MB">
     88<!ENTITY bzip2-ch5-du "6.4 MB">
    8889<!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
    8990<!ENTITY bzip2-ch6-du "7.7 MB">
    … …  
    184185<!ENTITY expect-ch5-sbu "0.1 SBU">
    185186
    186 <!ENTITY file-version "5.37">
    187 <!ENTITY file-size "867 KB">
     187<!ENTITY file-version "5.38">
     188<!ENTITY file-size "911 KB">
    188189<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
    189 <!ENTITY file-md5 "80c29aca745466c6c24d11f059329075">
     190<!ENTITY file-md5 "3217633ed09c7cd35ed8d04191675574">
    190191<!ENTITY file-home "https://www.darwinsys.com/file/">
    191 <!ENTITY file-ch5-du "19 MB">
     192<!ENTITY file-ch5-du "20 MB">
    192193<!ENTITY file-ch5-sbu "0.1 SBU">
    193 <!ENTITY file-ch6-du "19 MB">
     194<!ENTITY file-ch6-du "20 MB">
    194195<!ENTITY file-ch6-sbu "0.1 SBU">
    195196
    … …  
    199200<!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2">
    200201<!ENTITY findutils-home "&gnu-software;findutils/">
    201 <!ENTITY findutils-ch5-du "36 MB">
     202<!ENTITY findutils-ch5-du "39 MB">
    202203<!ENTITY findutils-ch5-sbu "0.3 SBU">
    203204<!ENTITY findutils-ch6-du "52 MB">
    … …  
    227228<!ENTITY gcc-md5 "3818ad8600447f05349098232c2ddc78">
    228229<!ENTITY gcc-home "https://gcc.gnu.org/">
    229 <!ENTITY gcc-ch5p1-du "3.1 GB">
    230 <!ENTITY gcc-ch5p1-sbu "12 SBU">
    231 <!ENTITY gcc-ch5p2-du "3.7 GB">
    232 <!ENTITY gcc-ch5p2-sbu "15 SBU">
     230<!ENTITY gcc-ch5p1-du "3.3 GB">
     231<!ENTITY gcc-ch5p1-sbu "9 SBU">
     232<!ENTITY gcc-ch5p2-du "3.6 GB">
     233<!ENTITY gcc-ch5p2-sbu "13 SBU">
    233234<!ENTITY gcc-ch6-du "4.2 GB ">
    234 <!ENTITY gcc-ch6-sbu "95 SBU (with tests)">
     235<!ENTITY gcc-ch6-sbu "91 SBU (with tests)">
    235236<!ENTITY libquadmath-version "0.0.0">
    236237<!ENTITY libstdcpp-version   "6.0.27">
    … …  
    258259<!ENTITY gettext-home "&gnu-software;gettext/">
    259260<!ENTITY gettext-ch5-du "300 MB">
    260 <!ENTITY gettext-ch5-sbu "1.8 SBU">
     261<!ENTITY gettext-ch5-sbu "2.0 SBU">
    261262<!ENTITY gettext-ch6-du "249 MB">
    262263<!ENTITY gettext-ch6-sbu "2.9 SBU">
    … …  
    268269<!ENTITY glibc-home "&gnu-software;libc/">
    269270<!ENTITY glibc-ch5-du "896 MB">
    270 <!ENTITY glibc-ch5-sbu "4.8 SBU">
    271 <!ENTITY glibc-ch6-du "3.3 GB">
    272 <!ENTITY glibc-ch6-sbu "21 SBU">
     271<!ENTITY glibc-ch5-sbu "4.6 SBU">
     272<!ENTITY glibc-ch6-du "3.2 GB">
     273<!ENTITY glibc-ch6-sbu "20 SBU">
    273274<!ENTITY libthread_db-version "1.0">
    274275
    … …  
    397398<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
    398399
    399 <!ENTITY libcap-version "2.27">
    400 <!ENTITY libcap-size "67 KB">
     400<!ENTITY libcap-version "2.28">
     401<!ENTITY libcap-size "93 KB">
    401402<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    402 <!ENTITY libcap-md5 "2e8f9fab32eb5ccb37969fe317fd17aa">
     403<!ENTITY libcap-md5 "4066ddca53fb7e146f98372c8e43afc4">
    403404<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
    404405<!ENTITY libcap-ch6-du "1.5 MB">
    … …  
    431432<!ENTITY linux-major-version "5">
    432433<!ENTITY linux-minor-version "4">
    433 <!ENTITY linux-patch-version "2">
     434<!ENTITY linux-patch-version "6">
    434435<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    435436<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    436 <!ENTITY linux-size "106,884 KB">
     437<!ENTITY linux-size "106,889 KB">
    437438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    438 <!ENTITY linux-md5 "07a4df090466eb7b24eec5fe4fbd5500">
     439<!ENTITY linux-md5 "d77c45902ea8cdbbffed46ae92ae5ec8">
    439440<!ENTITY linux-home "https://www.kernel.org/">
    440441<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    445446
    446447<!ENTITY linux-headers-ch5-du "1 GB">
    447 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
     448<!ENTITY linux-headers-ch5-sbu "0.2 SBU">
    448449<!ENTITY linux-headers-ch6-du "1 GB">
    449 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
     450<!ENTITY linux-headers-ch6-sbu "0.2 SBU">
    450451
    451452<!ENTITY linux-firmware-version "20191026">
    … …  
    464465<!ENTITY m4-ch5-du "20 MB">
    465466<!ENTITY m4-ch5-sbu "0.2 SBU">
    466 <!ENTITY m4-ch6-du "33 MB">
    467 <!ENTITY m4-ch6-sbu "0.4 SBU">
     467<!ENTITY m4-ch6-du "20 MB">
     468<!ENTITY m4-ch6-sbu "0.2 SBU">
    468469
    469470<!ENTITY make-version "4.2.1">
    … …  
    522523<!ENTITY ncurses-md5 "98c889aaf8d23910d2b92d65be2e737a">
    523524<!ENTITY ncurses-home "&gnu-software;ncurses/">
    524 <!ENTITY ncurses-ch5-du "41 MB">
    525 <!ENTITY ncurses-ch5-sbu "0.6 SBU">
     525<!ENTITY ncurses-ch5-du "40 MB">
     526<!ENTITY ncurses-ch5-sbu "0.7 SBU">
    526527<!ENTITY ncurses-ch6-du "42 MB">
    527528<!ENTITY ncurses-ch6-sbu "0.4 SBU">
    … …  
    559560<!ENTITY perl-home "https://www.perl.org/">
    560561<!ENTITY perl-ch5-du "275 MB">
    561 <!ENTITY perl-ch5-sbu "1.6 SBU">
     562<!ENTITY perl-ch5-sbu "1.4 SBU">
    562563<!ENTITY perl-ch6-du "272 MB">
    563564<!ENTITY perl-ch6-sbu "9.9 SBU">
    … …  
    590591     meson pages will be needed: python3.6 and python3.6m -->
    591592
    592 <!ENTITY python-version "3.8.0">
     593<!ENTITY python-version "3.8.1">
    593594<!ENTITY python-minor "3.8">
    594 <!ENTITY python-size "17,412 KB">
     595<!ENTITY python-size "17,411 KB">
    595596<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    596 <!ENTITY python-md5 "dbac8df9d8b9edc678d0f4cacdb7dbb0">
     597<!ENTITY python-md5 "b3fb85fd479c0bf950c626ef80cacb57">
    597598<!ENTITY python-home "https://www.python.org/">
    598 <!ENTITY python-ch5-du "381 MB">
    599 <!ENTITY python-ch5-sbu "1.4 SBU">
     599<!ENTITY python-ch5-du "408 MB">
     600<!ENTITY python-ch5-sbu "1.2 SBU">
    600601<!ENTITY python-ch6-du "399 MB">
    601602<!ENTITY python-ch6-sbu "1.3 SBU">
    602 <!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    603 <!ENTITY python-docs-md5 "2d6a7a58a7b4bccbde48174e0ad0ebbc">
    604 <!ENTITY python-docs-size "6,358 KB">
     603<!ENTITY python-docs-url "https://docs.python.org/3/archives/&python-version;/python-&python-version;-docs-html.tar.bz2">
     604<!ENTITY python-docs-md5 "01c826bfe13fd29f4cb954dcf71892ae">
     605<!ENTITY python-docs-size "6,426 KB">
    605606
    606607<!ENTITY readline-version "8.0">
    … …  
    678679<!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
    679680<!ENTITY tcl-home "http://tcl.sourceforge.net/">
    680 <!ENTITY tcl-ch5-du "71 MB">
     681<!ENTITY tcl-ch5-du "72 MB">
    681682<!ENTITY tcl-ch5-sbu "0.9 SBU">
    682683
    … …  
    714715<!ENTITY util-linux-ch6-sbu "1.2 SBU">
    715716
    716 <!ENTITY vim-version "8.1.2361">
    717 <!ENTITY vim-majmin "81">
    718 <!ENTITY vim-docdir "vim/vim81">
    719 <!ENTITY vim-size "14,267 KB">
     717<!ENTITY vim-version "8.2.0024">
     718<!ENTITY vim-majmin "82">
     719<!ENTITY vim-docdir "vim/vim82">
     720<!ENTITY vim-size "14,307 KB">
    720721<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
    721 <!ENTITY vim-md5 "7813b45901af53f81abeaf3c67ae9b34">
     722<!ENTITY vim-md5 "a1b5e7ae3ce2847dbd8672e6dd882750">
    722723<!ENTITY vim-home "https://www.vim.org">
    723724<!ENTITY vim-ch6-du "190 MB">
    … …  
    739740<!ENTITY xz-ch5-du "18 MB">
    740741<!ENTITY xz-ch5-sbu "0.2 SBU">
    741 <!ENTITY xz-ch6-du "16 MB">
     742<!ENTITY xz-ch6-du "14 MB">
    742743<!ENTITY xz-ch6-sbu "0.2 SBU">
    743744
Note: See TracChangeset for help on using the changeset viewer.