[packages/zfs] - fix userland building on x32
baggins
baggins at pld-linux.org
Sun Mar 1 14:52:53 CET 2015
commit bbb692205886bb528aa811dd81b5d0f459b9baf5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Mar 1 13:52:33 2015 +0000
- fix userland building on x32
x32.patch | 12 ++++++++++++
zfs.spec | 2 ++
2 files changed, 14 insertions(+)
---
diff --git a/zfs.spec b/zfs.spec
index fe20cdf..6d63ff6 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -34,6 +34,7 @@ Source0: http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/%{pname}-%{versi
# Source0-md5: 5bcc32c122934d421eba68e16826637d
Patch0: %{pname}-link.patch
Patch1: linux-3.18.patch
+Patch2: x32.patch
URL: http://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -213,6 +214,7 @@ p=`pwd`\
%setup -q -n %{pname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..5939080
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,12 @@
+--- zfs-0.6.3/lib/libspl/include/sys/isa_defs.h~ 2015-03-01 13:37:53.000000000 +0000
++++ zfs-0.6.3/lib/libspl/include/sys/isa_defs.h 2015-03-01 13:38:21.366669848 +0000
+@@ -41,7 +41,7 @@
+ #if !defined(__x86)
+ #define __x86
+ #endif
+
+-#if !defined(_LP64)
++#if !defined(_LP64) && !defined(_ILP32)
+ #define _LP64
+ #endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/bbb692205886bb528aa811dd81b5d0f459b9baf5
More information about the pld-cvs-commit
mailing list