diff options
Diffstat (limited to 'testing/fclones/musl-fix.patch')
-rw-r--r-- | testing/fclones/musl-fix.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/testing/fclones/musl-fix.patch b/testing/fclones/musl-fix.patch deleted file mode 100644 index 338116700cd..00000000000 --- a/testing/fclones/musl-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix compilation of tests on musl-based systems, -see: https://github.com/pkolaczk/fclones/issues/95 - -> Compiling reflink v0.1.3 -> error[E0308]: mismatched types -> --> /home/mpl/.cargo/registry/src/github.com-1ecc6299db9ec823/reflink-0.1.3/src/sys/unix.rs:21:39 -> | -> 21 | libc::ioctl(dest.as_raw_fd(), IOCTL_FICLONE, src.as_raw_fd()) -> | ^^^^^^^^^^^^^ expected `i32`, found `u64` -> | -> help: you can convert a `u64` to an `i32` and panic if the converted value doesn't fit -> | -> 21 | libc::ioctl(dest.as_raw_fd(), IOCTL_FICLONE.try_into().unwrap(), src.as_raw_fd()) -> | ++++++++++++++++++++ -> -> For more information about this error, try `rustc --explain E0308`. -> error: could not compile `reflink` due to previous error - ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -892,8 +892,7 @@ dependencies = [ - [[package]] - name = "reflink" - version = "0.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc585ec28b565b4c28977ce8363a6636cedc280351ba25a7915f6c9f37f68cbe" -+source = "git+https://github.com/nicokoch/reflink.git?rev=e8d93b465f5d9ad340cd052b64bbc77b8ee107e2#e8d93b465f5d9ad340cd052b64bbc77b8ee107e2" - dependencies = [ - "libc", - "winapi", -diff --git a/Cargo.toml b/Cargo.toml -index 3f96e5a..c4e1ee1 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -67,10 +67,10 @@ winapi = "0.3" - winapi-util = "0.1" - - [target.'cfg(not(any(target_os = "linux", target_os = "android")))'.dependencies] --reflink = "0.1" -+reflink = { git = "https://github.com/nicokoch/reflink.git", rev = "e8d93b465f5d9ad340cd052b64bbc77b8ee107e2" } - - [dev-dependencies] --reflink = "0.1" -+reflink = { git = "https://github.com/nicokoch/reflink.git", rev = "e8d93b465f5d9ad340cd052b64bbc77b8ee107e2" } - serde_test = "1.0" - tempfile = "3.3" |