diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-08 05:05:46 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-08 05:05:46 +0000 |
commit | 0de0994bc46f2d2fc265db20fc0885ce0ae73dd2 (patch) | |
tree | fe31882147141009cd4dddcfb38c057288a5b6ea /pkgs/development/libraries/zlib | |
parent | 1f3f0e6b652c67c8a14bfc457fd48a47c9d88500 (diff) |
zlib: largefile_source problem fixed upstream
svn path=/nixpkgs/branches/stdenv-updates/; revision=32135
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 69 |
2 files changed, 1 insertions, 72 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d3f1bfda4568c..1776e1349e6d3 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; - patches = - [ ./zlib-LARGEFILE64_SOURCE.patch ] - ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; configureFlags = if static then "" else "--shared"; diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch deleted file mode 100644 index 6ddb0ad706663..0000000000000 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,69 +0,0 @@ -http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html - -[Zlib-devel] Possible typo in zlib.h - -Mark Adler madler at madler.net - -*** a/zlib.h 2010-04-19 21:12:48.000000000 -0700 ---- b/zlib.h 2011-02-26 21:23:30.000000000 -0800 -*************** -*** 1572,1584 **** - #endif - - #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -! # define gzopen gzopen64 -! # define gzseek gzseek64 -! # define gztell gztell64 -! # define gzoffset gzoffset64 -! # define adler32_combine adler32_combine64 -! # define crc32_combine crc32_combine64 -! # ifdef _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)); ---- 1580,1601 ---- - #endif - - #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -! # ifdef Z_PREFIX_SET -! # define z_gzopen z_gzopen64 -! # define z_gzseek z_gzseek64 -! # define z_gztell z_gztell64 -! # define z_gzoffset z_gzoffset64 -! # define z_adler32_combine z_adler32_combine64 -! # define z_crc32_combine z_crc32_combine64 -! # else -! # define gzopen gzopen64 -! # define gzseek gzseek64 -! # define gztell gztell64 -! # define gzoffset gzoffset64 -! # define adler32_combine adler32_combine64 -! # define crc32_combine crc32_combine64 -! # endif -! # 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)); -*** a/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 ---- b/zconf.h.in 2010-07-18 09:05:49.000000000 -0700 -*************** -*** 374,380 **** - # undef _LARGEFILE64_SOURCE - #endif - -! #if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) - # include <unistd.h> /* for SEEK_* and off_t */ - # ifdef VMS - # include <unixio.h> /* for off_t */ ---- 375,385 ---- - # undef _LARGEFILE64_SOURCE - #endif - -! #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 -! # define Z_LARGE -! #endif -! -! #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) - # include <unistd.h> /* for SEEK_* and off_t */ - # ifdef VMS - # include <unixio.h> /* for off_t */ |