[gnome-builder] flatpak: fix libfuse build on aarch64
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: fix libfuse build on aarch64
- Date: Thu, 10 Aug 2017 20:24:14 +0000 (UTC)
commit d7480fb43d0a401cf5e25661e65e70d699f50a73
Author: Christian Hergert <chergert redhat com>
Date: Thu Aug 10 13:23:44 2017 -0700
flatpak: fix libfuse build on aarch64
.../fuse-2.9.2-namespace-conflict-fix.patch | 21 ++++++++++++++++++++
org.gnome.Builder.json | 4 +++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/build-aux/flatpak/fuse-2.9.2-namespace-conflict-fix.patch
b/build-aux/flatpak/fuse-2.9.2-namespace-conflict-fix.patch
new file mode 100644
index 0000000..ae67e7d
--- /dev/null
+++ b/build-aux/flatpak/fuse-2.9.2-namespace-conflict-fix.patch
@@ -0,0 +1,21 @@
+diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
+--- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400
++++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400
+@@ -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:
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index 801a9f1..75b77d7 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -77,6 +77,10 @@
"type": "archive",
"url":
"https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz",
"sha256": "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874"
+ },
+ {
+ "type": "patch",
+ "path": "build-aux/flatpak/fuse-2.9.2-namespace-conflict-fix.patch"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]