* Merged r9820.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10800

pkgs/os-specific/linux/reiserfsprogs/default.nix

@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
   };
 
+  patches = [./headers-fix.patch];
+
   meta = {
     homepage = http://www.namesys.com/;
     description = "Reiserfs utilities";

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)