diff options
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/rust-1.70-fix-rustix-build.patch | 21 | ||||
-rw-r--r-- | gnu/packages/patches/rust-openssl-sys-no-vendor.patch | 32 |
2 files changed, 21 insertions, 32 deletions
diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..d72a8fb07a --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml 2023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml 2023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ + + [target."cfg(unix)".dependencies.rustix] + version = "0.37.0" +-features = ["fs"] ++features = ["fs", "cc"] + + [target."cfg(windows)".dependencies.windows-sys] + version = "0.45.0" +--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies = [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch deleted file mode 100644 index 5872d4cf22..0000000000 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400 -+++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400 -@@ -31,10 +31,6 @@ - [package.metadata.pkg-config] - openssl = "1.0.1" - --[dependencies.bssl-sys] --version = "0.1.0" --optional = true -- - [dependencies.libc] - version = "0.2" - -@@ -46,16 +42,12 @@ - [build-dependencies.cc] - version = "1.0" - --[build-dependencies.openssl-src] --version = "111" --optional = true -- - [build-dependencies.pkg-config] - version = "0.3.9" - - [features] --unstable_boringssl = ["bssl-sys"] --vendored = ["openssl-src"] -+unstable_boringssl = [] -+vendored = [] - - [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] - version = "0.2.8" |