From 5c8aeaa7142f5f1e0467abaa1d1f9075a5ddcdd5 Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Fri, 18 Jan 2013 17:50:13 -0800 Subject: [PATCH] Add support for i686 building ZFS for Arch Linux now supports i686 packages. Conflicts: devsrc/spl-utils/PKGBUILD devsrc/spl/PKGBUILD devsrc/zfs-utils/PKGBUILD devsrc/zfs/PKGBUILD --- devsrc/spl-utils/PKGBUILD | 2 +- devsrc/spl/PKGBUILD | 11 ++++++++--- devsrc/zfs-utils/PKGBUILD | 2 +- devsrc/zfs/PKGBUILD | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/devsrc/spl-utils/PKGBUILD b/devsrc/spl-utils/PKGBUILD index fa2a602..e6d8bd6 100644 --- a/devsrc/spl-utils/PKGBUILD +++ b/devsrc/spl-utils/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc='Solaris Porting Layer kernel module support files.' depends=('linux=3.6.10') makedepends=('linux-headers=3.6.10') -arch=('x86_64') +arch=('i686' 'x86_64') url='http://zfsonlinux.org/' source=(http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz spl-utils.hostid) diff --git a/devsrc/spl/PKGBUILD b/devsrc/spl/PKGBUILD index 4f6b6bd..de79e9b 100644 --- a/devsrc/spl/PKGBUILD +++ b/devsrc/spl/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc='Solaris Porting Layer kernel modules.' depends=('spl-utils=0.6.0_rc13_3.6.10' 'linux=3.6.10') makedepends=('linux-headers=3.6.10') -arch=('x86_64') +arch=('i686' 'x86_64') url='http://zfsonlinux.org/' source=(http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz) groups=('archzfs') @@ -18,8 +18,13 @@ install=spl.install build() { cd ${srcdir}/spl-0.6.0-rc13 ./autogen.sh - ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \ - --with-config=kernel + if [[ $CARCH == i686 ]]; then + ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \ + --with-config=kernel --enable-atomic-spinlocks + else + ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \ + --with-config=kernel + fi make } diff --git a/devsrc/zfs-utils/PKGBUILD b/devsrc/zfs-utils/PKGBUILD index dac5aac..269a00a 100644 --- a/devsrc/zfs-utils/PKGBUILD +++ b/devsrc/zfs-utils/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="Kernel module support files for the Zettabyte File System." depends=('spl=0.6.0_rc13_3.6.10' 'linux=3.6.10') makedepends=('linux-headers=3.6.10') -arch=('x86_64') +arch=('i686' 'x86_64') url='http://zfsonlinux.org/' source=(http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz zfs-utils.bash-completion diff --git a/devsrc/zfs/PKGBUILD b/devsrc/zfs/PKGBUILD index 228b502..bf943a1 100644 --- a/devsrc/zfs/PKGBUILD +++ b/devsrc/zfs/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." depends=('spl=0.6.0_rc13_3.6.10' 'zfs-utils=0.6.0_rc13_3.6.10' 'linux=3.6.10') makedepends=('linux-headers=3.6.10') -arch=('x86_64') +arch=('i686' 'x86_64') url='http://zfsonlinux.org/' source=(http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz) groups=('archzfs')