Changeset 69d1a8e


Ignore:
Timestamp:
03/31/2020 02:23:02 AM (19 months ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, ken/refactor-virt, lazarus, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
876948d
Parents:
73db5703
Message:

Update to rustc-1.42.0 to again use system llvm for a smaller build,
but indicate why system llvm is a bad idea if using earlier llvm.
Patch seamonkey for this rustc version, its build is much slower.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22919 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • general/prog/rust.xml

    r73db5703 r69d1a8e  
    77  <!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.gz">
    88  <!ENTITY rust-download-ftp  " ">
    9   <!ENTITY rust-md5sum        "b348233fdbbf7858763bab7cb9c314ae">
    10   <!ENTITY rust-size          "146 MB">
     9  <!ENTITY rust-md5sum        "ff5731326898a7010403e1b148375de4">
     10  <!ENTITY rust-size          "130 MB">
    1111  <!-- Gentle Reminder: buildsize is how much the user requires for the real
    1212       install, i.e. the source with its DESTDIR *plus* the DESTDIR.  You
     
    1515       after the tests. -->
    1616
    17   <!ENTITY rust-buildsize     "9.0 GB (747 MB installed) including 344 MB of ~/.cargo files for the user building this. Add 2.3 GB if running the tests">
    18   <!ENTITY rust-time          "52 SBU (add 15 SBU for tests, both on a 4-core machine)">
     17  <!ENTITY rust-buildsize     "5.7 GB (250 MB installed) including 344 MB of ~/.cargo files for the user building this. Add 2.5 GB if running the tests">
     18  <!ENTITY rust-time          "33 SBU (add 17 SBU for tests, both on a 4-core machine)">
    1919]>
    2020
     
    188188    </para>
    189189
    190 <!--<bridgehead renderas="sect4">Recommended</bridgehead>
     190    <bridgehead renderas="sect4">Recommended</bridgehead>
    191191    <para role="recommended">
    192192      <package>clang</package> from <xref linkend="llvm"/>
    193193      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
    194194      system LLVM instead of building its shipped version)
    195     </para> FIXME reinstate when next using system llvm -->
     195      If using an older version, see the config.toml file below re
     196      using the shipped llvm, because of rust issue 69225.
     197    </para>
    196198
    197199    <bridgehead renderas="sect4">Optional</bridgehead>
     
    237239<screen><userinput>cat &lt;&lt; EOF &gt; config.toml
    238240<literal># see config.toml.example for more possible options
    239 # See the 9.1 book for an example using system LLVM
    240 # e.g. if you are still using llvm-9.0.1
     241# See the 8.4 book for an example using shipped LLVM
     242# e.g. if not installing clang, or using a version before 10.0
    241243[llvm]
    242244# by default, rust will build for a myriad of architectures
     
    305307      <filename>run-make-fulldeps/sysroot-crates-are-unstable</filename>
    306308      fails, presumably because we are using only stable features.
    307       <!-- https://github.com/rust-lang/rust/issues/63520 -->
    308       A fifth test, run-make-fulldeps/linker-output-non-utf8, is broken.
    309309      <!-- gdb appears to be fixed now
    310310      If gdb has been installed, in some circumstances tests in
     
    318318
    319319    <para>
    320       Therefore, you should determine the number of tests, failures, etc. The
    321       total number of tests which were considered is found by running:
    322     </para>
    323 
    324 <screen remap="test"><userinput>grep 'running .* tests' rustc-testlog | awk '{ sum += $2 } END { print sum }'</userinput></screen>
    325 
    326     <para>
    327       That should report 17349 tests. Similarly, the total tests which failed can
    328       be found by running:
     320      If you get any <emphasis>other</emphasis> failing test which reports an
     321      issue number then you should search for that issue.  For example, when
     322      rustc &gt;= 1.41.1 is built with a version of sysllvm before 10.0 the test
     323      for issue 69225 fails <ulink
     324      url="https://github.com/rust-lang/rust/issues/69225"/> and that should be
     325      regarded as a critical failurei (they released 1.41.1 because of it).
     326      Most other failures will not be critical.
     327    </para>
     328
     329    <para>
     330      Therefore, you should determine the number of failures. The total number
     331      of tests varies depending on which dependencies are present, e.g. more
     332      will be run if <command>gdb</command> is available. If you wish, the
     333      total number which were considered can be found if you run:
     334    </para>
     335
     336<screen remap="test"><userinput>egrep 'running [[:digit:]]+ test' rustc-testlog | awk '{ sum += $2 } END { print sum }'</userinput></screen>
     337
     338    <para>
     339      More importantly, the total of tests which failed can be found by running:
    329340    </para>
    330341
     
    332343
    333344    <para>
    334       And similarly for the tests which passed use $4, for those which were ignored
    335       (i.e. skipped) use $8 (and $10 for 'measured', $12 for 'filtered out' but both
    336       are probably zero). The breakdown does not quite match the overall total.
     345      And similarly if you care about how many tests passed use $4, for those
     346      which were ignored (i.e. skipped) use $8 (and $10 for 'measured', $12 for
     347      'filtered out' but both are probably zero).
    337348    </para>
    338349
  • introduction/welcome/changelog.xml

    r73db5703 r69d1a8e  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[ken] - Update to rustc-1.42.0 and patch seamonkey for this.
     49          Thanks to Bruce, Pierre and Uwe for their help. Fixes
     50          <ulink url="&blfs-ticket-root;13321">#13321</ulink>.</para>
     51        </listitem>
     52        <listitem>
    4853          <para>[bdubbs] - Update to xorg-server-1.20.8. Fixes
    4954          <ulink url="&blfs-ticket-root;13329">#13329</ulink>.</para>
  • packages.ent

    r73db5703 r69d1a8e  
    354354<!ENTITY ruby-patch-version           "0">
    355355<!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
    356 <!ENTITY rust-version                 "1.39.0">
     356<!ENTITY rust-version                 "1.42.0">
    357357<!ENTITY scons-version                "3.1.2">
    358358<!ENTITY slang-version                "2.3.2">
  • xsoft/graphweb/seamonkey.xml

    r73db5703 r69d1a8e  
    1010  <!ENTITY seamonkey-size          "277 MB">
    1111  <!ENTITY seamonkey-buildsize     "6.9 GB (154 MB installed)">
    12   <!ENTITY seamonkey-time          "19 SBU (on a 4-core machine)">
     12  <!ENTITY seamonkey-time          "29 SBU (on a 4-core machine)">
    1313]>
    1414
     
    8080      </listitem>
    8181    </itemizedlist>
    82 <!--
     82
    8383    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    8484    <itemizedlist spacing="compact">
    8585      <listitem>
    8686        <para>
    87           Required patch if using gcc-6 or later
    88           <ulink url="&patch-root;/seamonkey-&seamonkey-version;-gcc6-1.patch"/>
     87          Required patch for building with rustc &gt;= 1.41
     88          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-rust_fixes-1.patch"/>
    8989        </para>
    9090      </listitem>
    9191    </itemizedlist>
    92 -->
     92
    9393    <note>
    9494      <para>
     
    262262    </para></note>
    263263
     264    <para>
     265      Apply the patch to allow seamonkey to build with the current version of
     266      <command>rustc</command>:
     267    </para>
     268
     269<screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-rust_fixes-1.patch</userinput></screen>
     270
    264271    <!--
    265272    <para>
     
    279286
    280287<screen><userinput>sed -i -e '/pid_t gettid/,+3 s@^@//@' mozilla/tools/profiler/core/platform.h</userinput></screen>
    281 
    282     <para>
    283       Now adapt the code for a change introduced in rustc-1.39.0:
    284     </para>
    285 
    286 <screen><userinput>sed -i '/deny(warnings)/d' mozilla/xpcom/rust/nsstring/src/lib.rs</userinput></screen>
    287288
    288289    <!-- Doesn't seem to be needed anymore with 2.53.1
     
    368369    </para>
    369370-->
    370     <para>
    371       <command>sed -i '/deny(warnings)/d' ...</command> : rust-1.39 deprecated
    372       the "try!" call in favour of "?" which causes warnings, nsstring was
    373       treating warnings as errors.
    374     </para>
    375 
    376371    <para>
    377372      <command>make -f client.mk</command>: Mozilla products are packaged to
Note: See TracChangeset for help on using the changeset viewer.