diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-03-04 02:22:06 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-03-04 12:58:59 +0100 |
| commit | a7e65a8a957ceb752dd44d0447acee6c20309fe5 (patch) | |
| tree | aec167f3e730f9ae4fe81d43a1c4d63f0d5ec9a3 /pkgs/os-specific | |
| parent | c5b3257388cf303122cbac7a6ef2d2d7fef716ed (diff) | |
| download | nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar.gz nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar.bz2 nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar.lz nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar.xz nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.tar.zst nixlib-a7e65a8a957ceb752dd44d0447acee6c20309fe5.zip | |
zfs: Fix compilation on 3.13 and later kernels
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/3.13-compat.patch | 43 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 2 |
2 files changed, 44 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/3.13-compat.patch b/pkgs/os-specific/linux/zfs/3.13-compat.patch new file mode 100644 index 000000000000..f89d38f72acc --- /dev/null +++ b/pkgs/os-specific/linux/zfs/3.13-compat.patch @@ -0,0 +1,43 @@ +From 729210564a5325e190fc4fba22bf17bacf957ace Mon Sep 17 00:00:00 2001 +From: Richard Yao <ryao@gentoo.org> +Date: Mon, 25 Nov 2013 12:21:21 -0500 +Subject: [PATCH] Properly ignore bdi_setup_and_register return value + +This broke compilation against Linux 3.13 and GCC 4.7.3. + +Signed-off-by: Richard Yao <ryao@gentoo.org> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #1906 +--- + config/kernel-bdi-setup-and-register.m4 | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/config/kernel-bdi-setup-and-register.m4 b/config/kernel-bdi-setup-and-register.m4 +index 4196091..cb8ed67 100644 +--- a/config/kernel-bdi-setup-and-register.m4 ++++ b/config/kernel-bdi-setup-and-register.m4 +@@ -1,12 +1,14 @@ + dnl # + dnl # 2.6.34 API change +-dnl # The bdi_setup_and_register() helper function is avilable and ++dnl # The bdi_setup_and_register() helper function is available and + dnl # exported by the kernel. This is a trivial helper function but + dnl # using it significantly simplifies the code surrounding setting + dnl # up and tearing down the bdi structure. + dnl # + AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], + [AC_MSG_CHECKING([whether bdi_setup_and_register() is available]) ++ tmp_flags="$EXTRA_KCFLAGS" ++ EXTRA_KCFLAGS="-Wno-unused-result" + ZFS_LINUX_TRY_COMPILE_SYMBOL([ + #include <linux/backing-dev.h> + ], [ +@@ -18,4 +20,5 @@ AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], + ], [ + AC_MSG_RESULT(no) + ]) ++ EXTRA_KCFLAGS="$tmp_flags" + ]) +-- +1.8.5.5 + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 565a80b23d2d..ef313e6ca1e9 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ./3.13-compat.patch ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; |