[packages/libfuse] fix build on aarch64 (from debian)

atler atler at pld-linux.org
Tue May 5 22:22:41 CEST 2020


commit af5085d437553820bda2c0d51c7dc5f843e9ccc0
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue May 5 22:22:07 2020 +0200

    fix build on aarch64 (from debian)

 libfuse-arm64.patch | 26 ++++++++++++++++++++++++++
 libfuse.spec        |  2 ++
 2 files changed, 28 insertions(+)
---
diff --git a/libfuse.spec b/libfuse.spec
index f779945..a96b348 100644
--- a/libfuse.spec
+++ b/libfuse.spec
@@ -9,6 +9,7 @@ Group:		Applications/System
 Source0:	https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.gz
 # Source0-md5:	8000410aadc9231fd48495f7642f3312
 Patch0:		kernel-misc-fuse-Makefile.am.patch
+Patch1:		%{name}-arm64.patch
 URL:		https://github.com/libfuse/libfuse
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -92,6 +93,7 @@ Narzędzia do montowania systemów plików opartych na FUSE.
 %prep
 %setup -q -n fuse-%{version}
 %patch0 -p1
+%patch1 -p1
 
 sed -i '/FUSERMOUNT_PROG/s,fusermount,%{_bindir}/fusermount,' lib/mount.c
 
diff --git a/libfuse-arm64.patch b/libfuse-arm64.patch
new file mode 100644
index 0000000..66b7954
--- /dev/null
+++ b/libfuse-arm64.patch
@@ -0,0 +1,26 @@
+Author: Riku Voipio <riku.voipio at linaro.org>
+Description: fuse_kernel.h: clean includes
+ Use <linux/types.h> for linux and define types used for other operating systems
+ using <stdint.h> types (Closes: #752081).
+
+diff -Naurp fuse.orig/include/fuse_kernel.h fuse/include/fuse_kernel.h
+--- fuse.orig/include/fuse_kernel.h
++++ fuse/include/fuse_kernel.h
+@@ -88,12 +88,16 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+ 
+-#include <sys/types.h>
++#ifdef __linux__
++#include <linux/types.h>
++#else
++#include <stdint.h>
+ #define __u64 uint64_t
+ #define __s64 int64_t
+ #define __u32 uint32_t
+ #define __s32 int32_t
+ #define __u16 uint16_t
++#endif
+ 
+ /*
+  * Version negotiation:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libfuse.git/commitdiff/af5085d437553820bda2c0d51c7dc5f843e9ccc0



More information about the pld-cvs-commit mailing list