commit 061e59fa60b25ac533d655a8f8a14c99767f4b67
Author: Jakub Bogusz <[email protected]>
Date: Fri Dec 29 22:13:55 2023 +0100
- added x32 patch, enabled more architectures
zfs-fuse-x32.patch | 31 +++++++++++++++++++++++++++++++
zfs-fuse.spec | 4 +++-
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/zfs-fuse.spec b/zfs-fuse.spec
index fd7e495..80b8e58 100644
--- a/zfs-fuse.spec
+++ b/zfs-fuse.spec
@@ -17,6 +17,7 @@ Patch3: %{name}-tirpc.patch
Patch4: %{name}-format.patch
Patch5: %{name}-common.patch
Patch6: %{name}-xattr.patch
+Patch7: %{name}-x32.patch
URL: https://github.com/gordan-bobic/zfs-fuse
# also (but no tags)
#URL: https://github.com/zfs-fuse/zfs-fuse
@@ -27,7 +28,7 @@ BuildRequires: libtirpc-devel
BuildRequires: rpmbuild(macros) >= 1.337
BuildRequires: scons
BuildRequires: zlib-devel
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32 sparc sparcv9 sparc64 ppc ppc64 armel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -89,6 +90,7 @@ korporacyjnych. Oto lista możliwości:
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
cd src
diff --git a/zfs-fuse-x32.patch b/zfs-fuse-x32.patch
new file mode 100644
index 0000000..642bd34
--- /dev/null
+++ b/zfs-fuse-x32.patch
@@ -0,0 +1,31 @@
+--- zfs-fuse-0.7.2.2/src/lib/libsolcompat/include/sys/isa_defs.h.orig
2015-11-24 17:32:31.000000000 +0100
++++ zfs-fuse-0.7.2.2/src/lib/libsolcompat/include/sys/isa_defs.h
2023-12-29 22:00:13.162078148 +0100
+@@ -241,13 +241,18 @@ extern "C" {
+ #define _INT_ALIGNMENT 4
+ #define _FLOAT_ALIGNMENT 4
+ #define _FLOAT_COMPLEX_ALIGNMENT 4
++#ifdef _ILP32
++#define _LONG_ALIGNMENT 4
++#define _POINTER_ALIGNMENT 4
++#else
+ #define _LONG_ALIGNMENT 8
++#define _POINTER_ALIGNMENT 8
++#endif
+ #define _LONG_LONG_ALIGNMENT 8
+ #define _DOUBLE_ALIGNMENT 8
+ #define _DOUBLE_COMPLEX_ALIGNMENT 8
+ #define _LONG_DOUBLE_ALIGNMENT 16
+ #define _LONG_DOUBLE_COMPLEX_ALIGNMENT 16
+-#define _POINTER_ALIGNMENT 8
+ #define _MAX_ALIGNMENT 16
+ #define _ALIGNMENT_REQUIRED 1
+
+@@ -259,7 +264,7 @@ extern "C" {
+ /*
+ * Define the appropriate "implementation choices".
+ */
+-#if !defined(_LP64)
++#if !defined(_LP64) && !defined(_ILP32)
+ #define _LP64
+ #endif
+ #if !defined(_I32LPx) && defined(_KERNEL)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs-fuse.git/commitdiff/061e59fa60b25ac533d655a8f8a14c99767f4b67
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
