- fix userland building on x32

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
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
+ 

diff --git a/zfs.spec b/zfs.spec
index fe20cdf9fa36bb44121a99795f8d44b660dc1588..6d63ff6564d4a39feaac7dc2e0002c095c0e1c8c 100644 (file)
--- 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}