diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-12-01 20:05:06 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-12-01 20:05:06 +0000 |
| commit | c4640d5f49760a791f91368e7c00fc118826e93b (patch) | |
| tree | 2a7642385cb5b5ead20568175330b8b5d11e8732 /pkgs/os-specific/linux | |
| parent | b2149510dff1f4d301d9352fceb51edb3c5c6c5f (diff) | |
| download | nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar.gz nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar.bz2 nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar.lz nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar.xz nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.tar.zst nixpkgs-c4640d5f49760a791f91368e7c00fc118826e93b.zip | |
reiserfsprogs: headers-fix.patch added
svn path=/nixpkgs/branches/stdenv-updates/; revision=9820
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/reiserfsprogs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch | 19 |
2 files changed, 22 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/reiserfsprogs/default.nix b/pkgs/os-specific/linux/reiserfsprogs/default.nix index 49d018175d2..324ba28524c 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 00000000000..2c6693dae75 --- /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 <asm/unaligned.h> +- + #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) |