Fix 32-bit builds

This commit is contained in:
Jonathan Dieter 2018-08-10 10:42:38 +02:00
parent 1e1524a121
commit 0624af153f
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 05a3396180c170c6de2b6841f16852d0673090ca Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Fri, 10 Aug 2018 09:58:34 +0200
Subject: [PATCH] Fix 32-bit build for mfsmount3
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
src/mount/lizard_client.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/mount/lizard_client.h b/src/mount/lizard_client.h
index 0c08b7fc..20928d77 100644
--- a/src/mount/lizard_client.h
+++ b/src/mount/lizard_client.h
@@ -249,7 +249,11 @@ struct EntryParam {
}
Inode ino;
+#if FUSE_USE_VERSION >= 30
+ uint64_t generation;
+#else
unsigned long generation;
+#endif
struct stat attr;
double attr_timeout;
double entry_timeout;
--
2.17.1

View File

@ -1,7 +1,7 @@
Name: lizardfs
Summary: Distributed, fault tolerant file system
Version: 3.13.0
Release: 0.rc1%{?dist}.1
Release: 0.rc1r1%{?dist}
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
# src/common/coroutine.h, under the Boost license
License: GPLv3 and ASL 2.0 and Boost
@ -15,6 +15,8 @@ Patch0: 0001-Put-customized-spdlog-in-source-so-we-don-t-download.patch
# Fix for building with GCC 8
# See https://github.com/lizardfs/lizardfs/pull/677
Patch1: 0001-Add-missing-header.patch
# Fix for building fuse3 client on 32-bit platforms
Patch2: 0001-Fix-32-bit-build-for-mfsmount3.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: fuse3-devel
@ -445,6 +447,9 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
%changelog
* Fri Aug 10 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0.0.rc1r1
- Fix 32-bit builds
* Thu Aug 09 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0-0.rc1.1
- Fix fuse requires