diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-07 22:54:45 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-07 22:54:45 +0000 |
| commit | 0880b96a3d04a35ddad29a347e5607693723c9e1 (patch) | |
| tree | 73000b8afda6f38a12279b19103c27ca95f612f5 /pkgs/development/libraries/zlib | |
| parent | a839947b85dcd648ff350438d3529be94afafa88 (diff) | |
* Apply the zlib/cmake updates from the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30309
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 13157601e6f6e..6af8126f5a975 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; + patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; + configureFlags = if static then "" else "--shared"; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch new file mode 100644 index 0000000000000..ff308ba3f5e73 --- /dev/null +++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch @@ -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)); |