diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index fd173a0e20a..06726c4fa35 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -33,6 +33,11 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable patch_args = ["-p1"], patches = ["@@//bazel:cc_rs.patch"], )], + "libssh2-sys": [crate.annotation( + # Patch for determinism issues + patch_args = ["-p1"], + patches = ["@@//bazel:libssh2-sys.patch"], + )], "curve25519-dalek": [crate.annotation( rustc_flags = [ "-C", diff --git a/bazel/libssh2-sys.patch b/bazel/libssh2-sys.patch new file mode 100644 index 00000000000..28f52f5fd0d --- /dev/null +++ b/bazel/libssh2-sys.patch @@ -0,0 +1,22 @@ +# Patch for determinism issues +# https://github.com/alexcrichton/ssh2-rs/issues/340 +diff --git a/build.rs b/build.rs +index c4425ee..f99f132 100644 +--- a/build.rs ++++ b/build.rs +@@ -173,6 +173,7 @@ fn main() { + .unwrap(); + let version = &version_line[version_line.find('"').unwrap() + 1..version_line.len() - 1]; + ++ /* + let pkgconfig = dst.join("lib/pkgconfig"); + fs::create_dir_all(&pkgconfig).unwrap(); + fs::write( +@@ -188,6 +189,7 @@ fn main() { + .replace("@LIBSSH2VER@", version), + ) + .unwrap(); ++ */ + + cfg.warnings(false); + cfg.compile("ssh2");