Re-apply statvfs patch

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
epel9
Igor Gnatenko 7 years ago
parent 6cbbfb4746
commit c0db462214
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C

@ -0,0 +1,66 @@
From 340c5742ce33fe633e74d0273f341d1653ebeff4 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 8 Jan 2018 00:13:59 +0100
Subject: [PATCH] make statfs/statvfs to be available wherever they are
available
libc reads sys/statvfs.h on all OS except Windows which nix doesn't care
about.
Closes: https://github.com/nix-rust/nix/issues/831
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
(cherry picked from commit 08624d0a5c3649fea6463836690ae9b7f01093ac)
---
src/sys/mod.rs | 13 +------------
src/sys/statvfs.rs | 6 +++---
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/sys/mod.rs b/src/sys/mod.rs
index a94b8a0..395f04e 100644
--- a/src/sys/mod.rs
+++ b/src/sys/mod.rs
@@ -63,19 +63,8 @@ pub mod select;
pub mod quota;
-#[cfg(all(target_os = "linux",
- any(target_arch = "x86",
- target_arch = "x86_64",
- target_arch = "arm")),
- )]
+#[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))]
pub mod statfs;
-
-#[cfg(all(any(target_os = "linux",
- target_os = "macos"),
- any(target_arch = "x86",
- target_arch = "x86_64",
- target_arch = "arm")),
- )]
pub mod statvfs;
pub mod pthread;
diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs
index fbd0570..c1c66de 100644
--- a/src/sys/statvfs.rs
+++ b/src/sys/statvfs.rs
@@ -32,13 +32,13 @@ libc_bitflags!(
#[cfg(any(target_os = "android", target_os = "linux"))]
ST_MANDLOCK;
/// Write on file/directory/symlink
- #[cfg(any(target_os = "android", target_os = "linux"))]
+ #[cfg(target_os = "linux")]
ST_WRITE;
/// Append-only file
- #[cfg(any(target_os = "android", target_os = "linux"))]
+ #[cfg(target_os = "linux")]
ST_APPEND;
/// Immutable file
- #[cfg(any(target_os = "android", target_os = "linux"))]
+ #[cfg(target_os = "linux")]
ST_IMMUTABLE;
/// Do not update access times on files
#[cfg(any(target_os = "android", target_os = "linux"))]
--
2.16.2

@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Rust friendly bindings to *nix APIs
License: MIT
@ -15,6 +15,8 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
# Initial patched metadata
# * No dragonfly
Patch0: nix-0.10.0-fix-metadata.diff
# https://github.com/nix-rust/nix/commit/08624d0a5c3649fea6463836690ae9b7f01093ac
Patch1: 0001-make-statfs-statvfs-to-be-available-wherever-they-ar.patch
ExclusiveArch: %{rust_arches}
@ -69,6 +71,9 @@ which use %{crate} from crates.io.
%exclude %{cargo_registry}/%{crate}-%{version}/{Cross.toml,RELEASE_PROCEDURE.md,bors.toml,ci}
%changelog
* Thu Mar 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.10.0-2
- Re-apply statvfs patch
* Thu Mar 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.10.0-1
- Update to 0.10.0

Loading…
Cancel
Save