Changeset 8307474 for general/prog/rust.xml

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (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 lazarus

File:

• general/prog/rust.xml (modified) (8 diffs)

general/prog/rust.xml

@@ -7 +7 @@
   <!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.gz">
   <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "bd6fbe9ba5fe457d2514e92a6ccd7b24">
-  <!ENTITY rust-size          "161 MB">
+  <!ENTITY rust-md5sum        "6d1728cf0a86b0c5f33d3870379997ed">
+  <!ENTITY rust-size          "172 MB">
   <!-- Gentle Reminder: buildsize is how much the user requires for the real
        install, i.e. the source with its DESTDIR *plus* the DESTDIR.  You
@@ -15 +15 @@
        after the tests. -->
 
-  <!ENTITY rust-buildsize     "9.3 GB (407 MB installed) including 291 MB of ~/.cargo files for the user building this. Add 4.0 GB including extra 179 MB of ~/.cargo files if running the tests">
-  <!ENTITY rust-time          "31 SBU (add 13 SBU for tests, both on a 4-core machine)">
+  <!ENTITY rust-buildsize     "8.8 GB (370 MB installed) including 309 MB of ~/.cargo files for the user building this. Add 6.2 GB including extra 273 MB of ~/.cargo files if running the tests">
+  <!ENTITY rust-time          "27 SBU (including download time; add 13 SBU for tests, both on a 4-core machine)">
 ]>
 
@@ -83 +83 @@
         class="directory">/opt</filename> directory.  In particular, if you
         have reason to rebuild with a modified configuration (e.g. using the
-        shipped LLVM after building with shared LLVM, or for the
-        reverse situation) it is possible for the install to leave a broken
+        shipped LLVM after building with shared LLVM, perhaps to compile crates
+        for architectres which the BLFS LLVM build does not support)
+        it is possible for the install to leave a broken
         <command>cargo</command> program. In such a situation, either remove
         the existing installation first, or use a different prefix such as
@@ -207 +208 @@
       (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
       system LLVM instead of building its shipped version)
+      <!-- the versions of LLVM in LFS-10.0, 10.1 and 11.0 are good enough
+           to use for this version of rustc, so do not mention builds
+           using shipped LLVM here, those are a lot bigger.
       If using an older version, see the config.toml file below re
-      using the shipped llvm, because of rust issue 69225.
+      using the shipped llvm, because of rust issue 69225.-->
     </para>
 
@@ -304 +308 @@
     </para>
 
-<screen><userinput>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
+<screen><userinput>sed -i -e '/^curl /s/0.4.38/0.4.40/' \
+       -e '/^curl-sys /s/0.4.48/0.4.50/' \
+       src/tools/cargo/Cargo.toml &amp;&amp;
+
+export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
 python3 ./x.py build --exclude src/tools/miri</userinput></screen>
 
@@ -325 +333 @@
 
     <para>
-      At a minimum, seven tests will fail: ui/asm/inline-syntax.rs#arm,
-      assembly/target-feature-multiple.rs#SINGLEFLAG,
-      assembly/target-feature-multiple.rs#TWOFLAGS,
-      run-make-fulldeps/long-linker-command-lines, run-make-fulldeps/split-debuginfo,
-      run-make-fulldeps/split-dwarf, run-make-fulldeps/sysroot-crates-are-unstable.
-      With any recent version of <command>gdb</command>, four more failures
-      (debuginfo/extern-c-fn.rs, debuginfo/generator-objects.rs,
-      debuginfo/issue-57822.rs, debuginfo/pretty-huge-vec.rs) can be expected.
+      At a minimum, fifteen tests will fail: all the tests (twelve) in
+      the <quote>assembly</quote> suite, apparently because warnings are
+      tuened on,
+      run-make-fulldeps/long-linker-command-lines, run-make-fulldeps/print-cfg,
+      run-make-fulldeps/sysroot-crates-are-unstable.
+      If <command>gdb</command> is installed,  another failure
+      (debuginfo/function-names.rs) can be expected.
     </para>
 
@@ -440 +447 @@
       against the shipped llvm, or do not have clang, but the resulting build will
       be larger and take longer.
+    </para>
+
+    <para>
+      <command>sed -i -e '/^curl /s/0.4.38/0.4.40/' ... </command>: two crates
+      normally downloaded for this release do not correctly initialise
+      <application>curl</application> if using
+      <application>openssl-3.0.0</application>. Upstream has fixed that for a
+      future release, this sed causes the fixed versions to be used.
     </para>
 
@@ -560 +575 @@
       <seglistitem>
         <seg>
-          cargo-clippy, cargo-fmt, cargo-miri, cargo, clippy-driver, miri,
-          rls, rust-analyzer, rust-gdb, rust-gdbgui, rust-lldb, rustc,
+          cargo-clippy, cargo-fmt, cargo-miri (optional), cargo, clippy-driver,
+          miri (optional),
+          rls, rust-demangler, rust-gdb, rust-gdbgui, rust-lldb, rustc,
           rustdoc, rustfmt.
         </seg>
         <seg>
-          Many lib*&lt;16-byte-hash&gt;.so libraries.
+          librustc-driver-&lt;16-byte-hash&gt;.so,
+          libstd-&lt;16-byte-hash&gt;.so, and
+          libtest-&lt;16-byte-hash&gt;.so
         </seg>
         <seg>
           ~/.cargo,
-          /opt/rustc/lib/rustlib,
-          /opt/rustc/share/doc/rustc-&rust-version;, and
-          /opt/rustc/share/zsh/site-functions
+          /opt/rustc, symbolic link to
+          /opt/rustc-&rust-version;
         </seg>
       </seglistitem>