[packages/rust] up to 1.83.0
atler
atler at pld-linux.org
Thu Nov 28 23:51:13 CET 2024
commit 99d138f3005ed18a5f0d4fa92eb5b72334cdc966
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Nov 28 23:51:03 2024 +0100
up to 1.83.0
no-network.patch | 92 --------------------------------------------------------
rust.spec | 39 +++++++-----------------
2 files changed, 11 insertions(+), 120 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index 86d3604..9473b8a 100644
--- a/rust.spec
+++ b/rust.spec
@@ -21,9 +21,9 @@
# To bootstrap from scratch, set the channel and date from src/stage0
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD
-%define bootstrap_rust 1.81.0
+%define bootstrap_rust 1.82.0
%define bootstrap_cargo %{bootstrap_rust}
-%define bootstrap_date 2024-09-05
+%define bootstrap_date 2024-10-17
%ifarch x32
%define with_cross 1
@@ -36,24 +36,23 @@
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.82.0
-Release: 2
+Version: 1.83.0
+Release: 1
# Licenses: (rust itself) and (bundled libraries)
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: 8d6a14f1c8d0ab03dffbc81f7a839aa7
+# Source0-md5: cd5e72ac6b19f17788bb864aa0926761
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 68fccfcbb2652b963159470cbfadac6d
+# Source1-md5: a3307813972cc573f2ff0e387a229239
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 0b22eebbf33a257dd23a4eec57ead419
+# Source2-md5: fb65e88e9352c0a13ceaf5538261e3de
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 71784fa98a2c408668a365f9299b9489
+# Source3-md5: b9ab417d7241e4af89b1b435c9d73af4
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: bac5075d71a696c088f8e8cc340c3490
+# Source4-md5: 76326f93a8bdf382091056ab10ed925c
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 36bfc2d30ed4f8bae1d08ca6ad9ccb5c
-Patch0: no-network.patch
+# Source5-md5: 7c19afc014c75ef208fe8cd329130712
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
@@ -346,7 +345,6 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
%prep
%setup -q -n %{rustc_package}
-%patch0 -p1
%if %{with bootstrap}
%ifarch %{x8664} x32
@@ -454,20 +452,7 @@ find $RPM_BUILD_ROOT%{common_libdir} -maxdepth 1 -type f -name '*.so' \
%endif
# The shared libraries should be executable for debuginfo extraction.
-find $RPM_BUILD_ROOT%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
-
-# The libdir libraries are identical to those under rustlib/. It's easier on
-# library loading if we keep them in libdir, but we do need them in rustlib/
-# to support dynamic linking for compiler plugins, so we'll symlink.
-for rust_target in %rust_targets; do
- for l in libstd libtest ; do
- liblib=$RPM_BUILD_ROOT%{_libdir}/${l}-*.so
- libstd=$RPM_BUILD_ROOT%{rustlibdir}/${rust_target}/lib/${l}-*.so
- if [ "$(basename ${liblib})" = "$(basename ${libstd})" ]; then
- ln -vfsr ${libstd} $RPM_BUILD_ROOT%{_libdir}/
- fi
- done
-done
+find $RPM_BUILD_ROOT%{_prefix}/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
# Remove installer artifacts (manifests, uninstall scripts, etc.)
find $RPM_BUILD_ROOT%{rustlibdir}/ -maxdepth 1 -type f -exec rm -v '{}' '+'
@@ -509,8 +494,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rustdoc
%attr(755,root,root) %{_bindir}/rustfmt
%attr(755,root,root) %{_libdir}/librustc_driver-*.so
-%attr(755,root,root) %{_libdir}/libstd-*.so
-%attr(755,root,root) %{_libdir}/libtest-*.so
%{_mandir}/man1/rustc.1*
%{_mandir}/man1/rustdoc.1*
%dir %{rustlibdir}
diff --git a/no-network.patch b/no-network.patch
deleted file mode 100644
index a876876..0000000
--- a/no-network.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 741b3164d874ef95ab40d4aca7536265f84e1155 Mon Sep 17 00:00:00 2001
-From: onur-ozkan <work at onurozkan.dev>
-Date: Sun, 8 Sep 2024 20:14:50 +0300
-Subject: [PATCH 1/3] make dist vendoring configurable
-
-Signed-off-by: onur-ozkan <work at onurozkan.dev>
----
- src/bootstrap/src/core/build_steps/dist.rs | 6 +-----
- src/bootstrap/src/core/config/config.rs | 10 +++++++++-
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
-index b0bd18792beb2..294a56b3e976a 100644
---- a/src/bootstrap/src/core/build_steps/dist.rs
-+++ b/src/bootstrap/src/core/build_steps/dist.rs
-@@ -1011,11 +1011,7 @@ impl Step for PlainSourceTarball {
- write_git_info(builder.rust_info().info(), plain_dst_src);
- write_git_info(builder.cargo_info.info(), &plain_dst_src.join("./src/tools/cargo"));
-
-- // If we're building from git or tarball sources, we need to vendor
-- // a complete distribution.
-- if builder.rust_info().is_managed_git_subrepository()
-- || builder.rust_info().is_from_tarball()
-- {
-+ if builder.config.dist_vendor {
- builder.require_and_update_all_submodules();
-
- // Vendor all Cargo dependencies
-diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 79c2f73161e48..555a6a7f8bdeb 100644
---- a/src/bootstrap/src/core/config/config.rs
-+++ b/src/bootstrap/src/core/config/config.rs
-@@ -308,6 +308,7 @@ pub struct Config {
- pub dist_compression_formats: Option<Vec<String>>,
- pub dist_compression_profile: String,
- pub dist_include_mingw_linker: bool,
-+ pub dist_vendor: bool,
-
- // libstd features
- pub backtrace: bool, // support for RUST_BACKTRACE
-@@ -933,6 +934,7 @@ define_config! {
- compression_formats: Option<Vec<String>> = "compression-formats",
- compression_profile: Option<String> = "compression-profile",
- include_mingw_linker: Option<bool> = "include-mingw-linker",
-+ vendor: Option<bool> = "vendor",
- }
- }
-
-@@ -2028,13 +2030,19 @@ impl Config {
- compression_formats,
- compression_profile,
- include_mingw_linker,
-+ vendor,
- } = dist;
- config.dist_sign_folder = sign_folder.map(PathBuf::from);
- config.dist_upload_addr = upload_addr;
- config.dist_compression_formats = compression_formats;
- set(&mut config.dist_compression_profile, compression_profile);
- set(&mut config.rust_dist_src, src_tarball);
-- set(&mut config.dist_include_mingw_linker, include_mingw_linker)
-+ set(&mut config.dist_include_mingw_linker, include_mingw_linker);
-+ config.dist_vendor = vendor.unwrap_or_else(|| {
-+ // If we're building from git or tarball sources, enable it by default.
-+ config.rust_info.is_managed_git_subrepository()
-+ || config.rust_info.is_from_tarball()
-+ });
- }
-
- if let Some(r) = rustfmt {
-
-From 9778f25ea56cca85918835a7e72bc42121a42888 Mon Sep 17 00:00:00 2001
-From: onur-ozkan <work at onurozkan.dev>
-Date: Sun, 8 Sep 2024 20:16:25 +0300
-Subject: [PATCH 2/3] document `dist.vendor` in `config.example.toml`
-
-Signed-off-by: onur-ozkan <work at onurozkan.dev>
----
- config.example.toml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/config.example.toml b/config.example.toml
-index 2b5e9ae117db7..c66d65e639aa0 100644
---- a/config.example.toml
-+++ b/config.example.toml
-@@ -942,3 +942,6 @@
- # Copy the linker, DLLs, and various libraries from MinGW into the Rust toolchain.
- # Only applies when the host or target is pc-windows-gnu.
- #include-mingw-linker = true
-+
-+# Whether to vendor dependencies for the dist tarball.
-+#vendor = if "is a tarball source" || "is a git repository" { true } else { false }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/99d138f3005ed18a5f0d4fa92eb5b72334cdc966
More information about the pld-cvs-commit
mailing list