Skip to content

Commit

Permalink
rust: update to 1.80.0
Browse files Browse the repository at this point in the history
- Remove two upstreamed patches
- Manually refresh one patch
- Automatically refresh another patch

Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
  • Loading branch information
krant authored and 1715173329 committed Jul 26, 2024
1 parent 1761ed0 commit 8d68f0b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 164 deletions.
6 changes: 3 additions & 3 deletions lang/rust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=rust
PKG_VERSION:=1.78.0
PKG_RELEASE:=2
PKG_VERSION:=1.80.0
PKG_RELEASE:=1

PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
PKG_HASH:=ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9
PKG_HASH:=6f606c193f230f6b2cae4576f7b24d50f5f9b25dff11dbf9b22f787d3521d672
HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src

PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
Expand Down
4 changes: 2 additions & 2 deletions lang/rust/patches/0001-Update-xz2-and-use-it-static.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Subject: [PATCH] Update xz2 and use it static

--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -61,7 +61,7 @@ tar = "0.4"
@@ -62,7 +62,7 @@ tar = "0.4"
termcolor = "1.4"
toml = "0.5"
walkdir = "2.4"
-xz2 = "0.1"
+xz2 = { version = "0.1", features = ["static"] }

# Dependencies needed by the build-metrics feature
sysinfo = { version = "0.30", optional = true }
sysinfo = { version = "0.30", default-features = false, optional = true }

This file was deleted.

8 changes: 4 additions & 4 deletions lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This patch bumps all libc dependencies and checksums to 0.2.147, which includes the fix for musl 1.2.4.

--- a/vendor/elasticlunr-rs/Cargo.lock
+++ b/vendor/elasticlunr-rs/Cargo.lock
--- a/vendor/elasticlunr-rs-3.0.2/Cargo.lock
+++ b/vendor/elasticlunr-rs-3.0.2/Cargo.lock
@@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d

[[package]]
Expand All @@ -14,8 +14,8 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes

[[package]]
name = "lindera"
--- a/vendor/libffi/Cargo.lock
+++ b/vendor/libffi/Cargo.lock
--- a/vendor/libffi-3.2.0/Cargo.lock
+++ b/vendor/libffi-3.2.0/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b

[[package]]
Expand Down
108 changes: 0 additions & 108 deletions lang/rust/patches/0004-Use-an-helper-to-move-the-files.patch

This file was deleted.

0 comments on commit 8d68f0b

Please sign in to comment.