diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-11 15:05:55 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-11 16:21:07 -0700 |
| commit | 476b70c39c723f525f56959b70ae6a40a9763339 (patch) | |
| tree | 5a73efdc4eec77ca6a998cc7412eafed642d2253 /pkgs | |
| parent | cb2fcd412a8b38002f7abe629c846d6630b90758 (diff) | |
| download | nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar.gz nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar.bz2 nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar.lz nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar.xz nixlib-476b70c39c723f525f56959b70ae6a40a9763339.tar.zst nixlib-476b70c39c723f525f56959b70ae6a40a9763339.zip | |
ceph-dev: Fix for i686-linux
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/dev.nix | 5 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch new file mode 100644 index 000000000000..142bcabec544 --- /dev/null +++ b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch @@ -0,0 +1,25 @@ +From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001 +From: Kefu Chai <kchai@redhat.com> +Date: Fri, 17 Jul 2015 01:12:03 +0800 +Subject: [PATCH] cls: fix the build on i386 + +this is a leftover of 0dae022 + +Signed-off-by: Kefu Chai <kchai@redhat.com> +--- + src/cls/cephfs/cls_cephfs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h +index 3cee0db..d4a5f23 100644 +--- a/src/cls/cephfs/cls_cephfs.h ++++ b/src/cls/cephfs/cls_cephfs.h +@@ -118,7 +118,7 @@ class AccumulateResult + // Largest object seen + uint64_t max_obj_size; + // Highest mtime seen +- time_t max_mtime; ++ int64_t max_mtime; + + AccumulateResult() + : ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0) diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index 2d0a1a633063..23757278b6f0 100644 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -9,5 +9,8 @@ callPackage ./generic.nix (args // rec { sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx"; }; - patches = [ ./fix-pythonpath.patch ]; + patches = [ + ./fix-pythonpath.patch + ./9.0.3-i686-fix.patch + ]; }) |