Changeset e7c8506a

Timestamp:

11/20/2021 11:29:04 PM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e44952d

Parents:

4b852e51

Message:

Update to rustc-1.56.1 and fixit for openssl-3 :

Use a sed to ensure fixed versions of the curl and curl-sys crates
are downloaded.

Files:

• general/prog/rust.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

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        "2a5f12b375b9b8fffe2340f6c2d27eab">
+  <!ENTITY rust-md5sum        "6d1728cf0a86b0c5f33d3870379997ed">
   <!ENTITY rust-size          "172 MB">
   <!-- Gentle Reminder: buildsize is how much the user requires for the real
@@ -15 +15 @@
        after the tests. -->
 
-  <!ENTITY rust-buildsize     "8.8 GB (424 MB installed) including 285 MB of ~/.cargo files for the user building this. Add 5.9 GB including extra 273 MB of ~/.cargo files if running the tests">
-  <!ENTITY rust-time          "22 SBU (including download time; 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, fourteen tests will fail: all the tests (eleven) in
-      the <quote>assembly</quote> suite,
+      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.
@@ -438 +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>
 

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>November 20th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to rustc-1.56.1 and adjust it to be
+          ready for openssl-3.0.0.. Fixes
+          <ulink url="&blfs-ticket-root;15767">#15767</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 18th, 2021</para>
       <itemizedlist>

packages.ent

@@ -373 +373 @@
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
 <!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version                 "1.56.0">
+<!ENTITY rust-version                 "1.56.1">
 <!ENTITY scons-version                "4.2.0">
 <!ENTITY slang-version                "2.3.2">