From 66b5dfadcbd66c6a106406d8b1d6c1a9d1995f6e Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Mon, 24 Feb 2025 20:35:17 +0000 Subject: [PATCH] rust: update to 1.85.0 Fixes podman build breakage which was caused by podman depending on netavark, which in turn depends on rust-iptables. rust-iptables requires rust 1.85.0 since commit 75825cd https://github.com/yaa110/rust-iptables/commit/75825cd9c13db91f697461e6fa91f78c5e927008 Signed-off-by: Jonathan McCrohan (cherry picked from commit c67502852851366baff7868ea53b9e8c70bc1fe0) [refresh patches] Signed-off-by: Tianling Shen --- lang/rust/Makefile | 4 ++-- lang/rust/patches/0001-Update-xz2-and-use-it-static.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index bc54879305..a9466f6f81 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust -PKG_VERSION:=1.84.0 +PKG_VERSION:=1.85.0 PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=15cee7395b07ffde022060455b3140366ec3a12cbbea8f1ef2ff371a9cca51bf +PKG_HASH:=2f4f3142ffb7c8402139cfa0796e24baaac8b9fd3f96b2deec3b94b4045c6a8a HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src PKG_MAINTAINER:=Luca Barbato diff --git a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch index c9bc0fdddc..336eacb015 100644 --- a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch +++ b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Update xz2 and use it static --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -60,7 +60,7 @@ tar = "0.4" +@@ -59,7 +59,7 @@ tar = "0.4" termcolor = "1.4" toml = "0.5" walkdir = "2.4" @@ -17,4 +17,4 @@ Subject: [PATCH] Update xz2 and use it static +xz2 = { version = "0.1", features = ["static"] } # Dependencies needed by the build-metrics feature - sysinfo = { version = "0.30", default-features = false, optional = true } + sysinfo = { version = "0.33.0", default-features = false, optional = true, features = ["system"] } -- 2.30.2