From c4640d5f49760a791f91368e7c00fc118826e93b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 Dec 2007 20:05:06 +0000 Subject: [PATCH] reiserfsprogs: headers-fix.patch added svn path=/nixpkgs/branches/stdenv-updates/; revision=9820 --- .../linux/reiserfsprogs/default.nix | 5 +++-- .../linux/reiserfsprogs/headers-fix.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch diff --git a/pkgs/os-specific/linux/reiserfsprogs/default.nix b/pkgs/os-specific/linux/reiserfsprogs/default.nix index 49d018175d2c..324ba28524c4 100644 --- a/pkgs/os-specific/linux/reiserfsprogs/default.nix +++ b/pkgs/os-specific/linux/reiserfsprogs/default.nix @@ -7,9 +7,10 @@ stdenv.mkDerivation { sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0"; }; + patches = [./headers-fix.patch]; + meta = { homepage=http://www.namesys.com/; - description="Reiserfs Utilities"; - license="GPL-2"; + }; } diff --git a/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch b/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch new file mode 100644 index 000000000000..2c6693dae75c --- /dev/null +++ b/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch @@ -0,0 +1,19 @@ +diff -pruN 1:3.6.19-4/include/reiserfs_fs.h 1:3.6.19-4ubuntu2/include/reiserfs_fs.h +--- 1:3.6.19-4/include/reiserfs_fs.h 2004-09-16 08:49:05.000000000 +0100 ++++ 1:3.6.19-4ubuntu2/include/reiserfs_fs.h 2006-12-14 18:08:28.000000000 +0000 +@@ -38,15 +38,10 @@ + # define extern_inline + #endif + +-#include +- + #ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) + # define get_unaligned(ptr) (*(ptr)) + # define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) + #endif +-#endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) + #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)