Filter -Wl,* from LDFLAGS to prevent build failures on ARM

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 24 insertions, 12 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index c32875c9e215..ab901f38f39c 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.14 2013/01/16 08:57:38 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.15 2013/01/16 09:01:09 ryao Exp $
+
+  16 Jan 2013; Richard Yao <ryao@gentoo.org> zfs-kmod-9999.ebuild:
+  Filter -Wl,* from LDFLAGS to prevent build failures on ARM
 
 *zfs-kmod-0.6.0_rc13-r2 (16 Jan 2013)
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index a79ba9fba2a3..c38cc854efa7 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.7 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.8 2013/01/16 09:01:09 ryao Exp $
 
 EAPI="4"
 
@@ -16,8 +16,8 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-${MY_PV}"
+	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
+	S="${WORKDIR}/zfs-zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -55,7 +55,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 5 || die "Linux 3.5 is the latest supported version."; }
+		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -63,17 +63,22 @@ pkg_setup() {
 src_prepare() {
 	if [ ${PV} != "9999" ]
 	then
-		# Fix various deadlocks
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-1-of-3.patch"
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-2-of-3.patch"
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-3-of-3.patch"
-	fi
+		# Fix regression where snapshots are not visible
+		epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch"
+
+		# Fix deadlock involving concurrent `zfs destroy` and `zfs list` commands
+		epatch "${FILESDIR}/${P}-fix-recursive-reader.patch"
 
+		# Fix USE=debug build failure involving GCC 4.7
+		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
+	fi
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
 	set_arch_to_kernel
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
@@ -93,6 +98,10 @@ src_install() {
 pkg_postinst() {
 	linux-mod_pkg_postinst
 
-	use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
 
 }