Skip to content

Commit

Permalink
rust: fix for releases not containing 15220
Browse files Browse the repository at this point in the history
  • Loading branch information
hadfl committed Jan 30, 2023
1 parent 4d14e41 commit a2a6a52
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build/rust/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ SUMMARY="Rust systems programming language"
DESC="Rust is a systems programming language that runs blazingly fast, "
DESC+="prevents segfaults, and guarantees thread safety."

# TODO: change the configure option back to `--enable-vendor` once
# rust 1.68.0 has been released and the errno patch can be dropped

set_builddir ${PROG}c-${VER}-src

OPREFIX=$PREFIX
Expand Down Expand Up @@ -67,7 +70,7 @@ CONFIGURE_OPTS_64="

CONFIGURE_OPTS+="
--release-description=OmniOS/$RELVER
--enable-vendor
--disable-vendor
--enable-extended
--build=$RUSTARCH
--target=$RUSTARCH
Expand Down
15 changes: 15 additions & 0 deletions build/rust/patches/errno.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -4644,9 +4644,9 @@ dependencies = [

[[package]]
name = "rustix"
-version = "0.36.3"
+version = "0.36.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
dependencies = [
"bitflags",
"errno",
1 change: 1 addition & 0 deletions build/rust/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
errno.patch

0 comments on commit a2a6a52

Please sign in to comment.