From d0f8e8d3f9a97cd0ffc4c52b34911b286bd3a788 Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Fri, 10 Jul 2020 19:18:44 +0300 Subject: [PATCH] sys-fs/stratisd: fix build devicemapper-rs with musl libc --- ...icemapper-rs-compatibility-with-musl.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 sys-fs/stratisd/files/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch diff --git a/sys-fs/stratisd/files/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch b/sys-fs/stratisd/files/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch new file mode 100644 index 0000000..7d95c9a --- /dev/null +++ b/sys-fs/stratisd/files/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch @@ -0,0 +1,35 @@ +From 616fccece704b632427f9c8e1b7d2a4c8b7907d1 Mon Sep 17 00:00:00 2001 +From: John Baublitz +Date: Thu, 9 Jul 2020 15:41:54 -0400 +Subject: [PATCH] Fix issue of devicemapper-rs compatibility with musl + +--- + src/core/dm.rs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/core/dm.rs b/src/core/dm.rs +index fe598c6..3c6d925 100644 +--- a/src/core/dm.rs ++++ b/src/core/dm.rs +@@ -4,7 +4,7 @@ + + use std::{cmp, fs::File, mem::size_of, os::unix::io::AsRawFd, slice, u32}; + +-use nix::libc::{c_ulong, ioctl as nix_ioctl}; ++use nix::libc::ioctl as nix_ioctl; + + use crate::{ + core::{ +@@ -136,8 +136,7 @@ impl DM { + .as_mut() + .expect("pointer to own structure v can not be NULL") + }; +- let op = +- request_code_readwrite!(DM_IOCTL, ioctl, size_of::()) as c_ulong; ++ let op = request_code_readwrite!(DM_IOCTL, ioctl, size_of::()); + loop { + if let Err(err) = + unsafe { convert_ioctl_res!(nix_ioctl(self.file.as_raw_fd(), op, v.as_mut_ptr())) } +-- +2.26.2 +