dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix _LARGEFILE64_SOURCE in zlib

Browse Source 
svn path=/nixpkgs/trunk/; revision=30307
This commit is contained in:
David Guibert 2011-11-07 21:33:37 +00:00
parent ddcce29b18
commit f5a2998c03
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/zlib/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation (rec {
sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30";
}; };
patches = [ ./zlib-LARGEFILE64_SOURCE.patch ];
configureFlags = if static then "" else "--shared"; configureFlags = if static then "" else "--shared";
preConfigure = '' preConfigure = ''

14
pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch Normal file
View File

@ -0,0 +1,14 @@
Fix compilation with _LARGEFILE64_SOURCE
diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h
--- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200
+++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200
@@ -1578,7 +1578,7 @@
# define gzoffset gzoffset64
# define adler32_combine adler32_combine64
# define crc32_combine crc32_combine64
-# ifdef _LARGEFILE64_SOURCE
+# ifndef _LARGEFILE64_SOURCE
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));