| Newsgroups |
gmane.linux.lfs.beyond.book |
| Message-ID |
<[email protected]> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository blfs.
commit 817f87a4751287e58d08b2bd66ecf2489eaadfc1
Author: Xi Ruoyao <[email protected]>
AuthorDate: Sat Jul 18 14:53:28 2026 +0800
rust: update to 1.97.1
---
general/prog/rust.xml | 45 +++-----------------------------------
introduction/welcome/changelog.xml | 4 ++++
packages.ent | 2 +-
3 files changed, 8 insertions(+), 43 deletions(-)
diff --git a/general/prog/rust.xml b/general/prog/rust.xml
index f4bbf293d2..93299b849a 100644
--- a/general/prog/rust.xml
+++ b/general/prog/rust.xml
@@ -6,8 +6,8 @@
<!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.xz">
<!ENTITY rust-download-ftp " ">
- <!ENTITY rust-md5sum "75632c07ce29c765b905f26719c3cb3c">
- <!ENTITY rust-size "231 MB">
+ <!ENTITY rust-md5sum "c6fc3febcd3b1235cf4f00c3e05559b3">
+ <!ENTITY rust-size "232 MB">
<!ENTITY rust-buildsize "10 GB (324 MB installed); add 11 GB if running the tests">
<!ENTITY rust-time "10 SBU (including download time; add 15 SBU for tests, both using parallelism=8)">
]>
@@ -136,27 +136,6 @@
</listitem>
</itemizedlist>
- <!-- keep this here for reuse in case we need a patch -->
- <!-- deliberately skipped turning version and md5 into entities:
- it will be uneeded in 1.97.0 per
- https://github.com/rust-lang/cargo/pull/16931. -->
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- OpenSSL Rust binding updated to support OpenSSL 4:
- <ulink url="https://github.com/lfs-book/rust-openssl/archive/v0.10.78/rust-openssl-0.10.78.tar.gz"/>
- </para>
- </listitem>
- <listitem>
- <para>
- Download MD5 sum: 8bfcc36cba65c98380f7ac1ec07efdb4
- </para>
- </listitem>
- </itemizedlist>
-
- &github-lfs-fork;
-
<bridgehead renderas="sect3">Rust Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -248,7 +227,7 @@ ln -svfn rustc-&rust-version; /opt/rustc</userinput></screen>
# Tell x.py that the editors have reviewed the content of this file
# and updated it to follow the major changes of the building system,
# so x.py will not warn users to review that information.
-change-id = 154508
+change-id = 154587
[llvm]
# When using the system installed copy of LLVM, prefer the shared libraries
@@ -292,24 +271,6 @@ llvm-config = "/usr/bin/llvm-config"
llvm-config = "/usr/bin/llvm-config"</literal>
EOF</userinput></screen>
- <para>
- Use a newer version of the OpenSSL Rust binding to allow building
- this package with OpenSSL 4:
- </para>
-
-<screen><userinput>tar xf ../rust-openssl-0.10.78.tar.gz &&
-
-cat >> src/tools/cargo/Cargo.toml << EOF &&
-<literal>[patch.crates-io]
-openssl = { path = "../../../rust-openssl-0.10.78/openssl" }
-openssl-sys = { path = "../../../rust-openssl-0.10.78/openssl-sys" }
-</literal>EOF
-
-sed -ri src/tools/cargo/Cargo.lock \
- -e '/name = "openssl-sys"/,/^$/{/source|checksum/d;s/0.9.112/0.9.114/}' \
- -e '/name = "openssl"/,/^$/{/source|checksum/d;s/0.10.76/0.10.78/}' \
- -e '/name = "openssl-macros"/,/^$/{/source|checksum/d}'</userinput></screen>
-
<!-- retain here in case we need a patch
<para>
If running the test suite, apply a patch to make it compatible with
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f610690e5a..070b780d70 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,10 @@
<listitem>
<para>July 18th, 2026</para>
<itemizedlist>
+ <listitem>
+ <para>[xry111] - Update to rustc-1.97.1. Fixes
+ <ulink url="&blfs-ticket-root;23608">#23608</ulink>.</para>
+ </listitem>
<listitem>
<para>[xry111] - Patch LLVM to fix a bug which might break
the upcoming Rust update. Part of
diff --git a/packages.ent b/packages.ent
index a408b5fbda..019817cbf6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -415,7 +415,7 @@
<!ENTITY ruby-patch-version "6">
<!ENTITY ruby-version "&ruby-minor-version;.&ruby-patch-version;">
<!ENTITY ruby-gemdir "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version "1.96.0">
+<!ENTITY rust-version "1.97.1">
<!ENTITY rust-bindgen-version "0.72.1">
<!ENTITY scons-version "4.10.1">
<!ENTITY slang-version "2.3.3">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page