From a80b9777f262a79705954a95e23d15bcd3718d96 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Sat, 10 Jan 2015 02:37:22 +0100 Subject: [PATCH] deps: don't build minizip into zlib It's an optional extension that node/iojs doesn't use. PR-URL: https://github.com/iojs/io.js/pull/276 Reviewed-by: Ben Noordhuis --- deps/zlib/zlib.gyp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index afcebb4c02..cf0b090d9e 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -13,14 +13,6 @@ 'target_name': 'zlib', 'type': 'static_library', 'sources': [ - 'contrib/minizip/ioapi.c', - 'contrib/minizip/ioapi.h', - 'contrib/minizip/iowin32.c', - 'contrib/minizip/iowin32.h', - 'contrib/minizip/unzip.c', - 'contrib/minizip/unzip.h', - 'contrib/minizip/zip.c', - 'contrib/minizip/zip.h', 'adler32.c', 'compress.c', 'crc32.c', @@ -50,8 +42,6 @@ ], 'include_dirs': [ '.', - # For contrib/minizip - './contrib/minizip', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -62,9 +52,6 @@ ['OS!="win"', { 'cflags!': [ '-ansi' ], 'defines': [ 'Z_HAVE_UNISTD_H' ], - 'sources!': [ - 'contrib/minizip/iowin32.c' - ], }], ['OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="android"', { # Mac, Android and the BSDs don't have fopen64, ftello64, or @@ -90,14 +77,6 @@ 'defines': [ 'USE_SYSTEM_ZLIB', ], - 'sources': [ - 'contrib/minizip/ioapi.c', - 'contrib/minizip/ioapi.h', - 'contrib/minizip/unzip.c', - 'contrib/minizip/unzip.h', - 'contrib/minizip/zip.c', - 'contrib/minizip/zip.h', - ], 'link_settings': { 'libraries': [ '-lz',