about summary refs log tree commit diff
path: root/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-01-16 14:59:04 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-01-16 14:59:04 +0000
commitbe72ec22e0ae2ee68f66b5cb31208717a68c48e5 (patch)
tree503ddb95e414995543228241f32abecfec3358af /pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
parent1f86f426ef267a640c433460f38ab96ac31c225c (diff)
downloadnixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar.gz
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar.bz2
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar.lz
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar.xz
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.tar.zst
nixlib-be72ec22e0ae2ee68f66b5cb31208717a68c48e5.zip
Fixing the build of jfsrec under gcc 4.4, taking a patch from archlinux.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19481
Diffstat (limited to 'pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch')
-rw-r--r--pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
new file mode 100644
index 000000000000..063a7c24813b
--- /dev/null
+++ b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
@@ -0,0 +1,24 @@
+Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3.
+http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch
+diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp
+--- jfsrec/src/device.cpp	2009-12-01 18:34:03.860437077 +0100
++++ jfsrec-build/src/device.cpp	2009-12-01 18:39:48.297067088 +0100
+@@ -20,6 +20,7 @@
+ //Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs)
+ 
+ #include "device.h"
++#include <stdio.h>
+ #ifdef __linux__
+  #include <linux/fs.h>
+  #include <sys/ioctl.h>
+diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp
+--- jfsrec/src/unicode_to_utf8.cpp	2009-12-01 18:34:03.860437077 +0100
++++ jfsrec-build/src/unicode_to_utf8.cpp	2009-12-01 18:39:43.501626737 +0100
+@@ -8,6 +8,7 @@
+  */
+ #include <config.h>
+ #include "unicode_to_utf8.h"
++#include <string.h>
+ #define JFS_PATH_MAX 4096
+ 
+ /*