From 1ae79202d0a358e01947ab53b006802896dd13be Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 31 Jan 2017 08:12:24 -0800 Subject: [PATCH 1/2] deps: hide zlib internal symbols Use HAVE_HIDDEN when compiling zlib so it's internal symbols have __attribute__((visibility ("hidden"))). --- deps/zlib/zlib.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index cf0b090d9ef0c4..a7370bf1ffba33 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -48,6 +48,9 @@ '.', ], }, + 'defines': [ + 'HAVE_HIDDEN', + ], 'conditions': [ ['OS!="win"', { 'cflags!': [ '-ansi' ], From d271bd30afe91fa33026568f63e75373876b242d Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 1 Feb 2017 10:03:52 -0800 Subject: [PATCH 2/2] fixup! deps: hide zlib internal symbols --- deps/zlib/zlib.gyp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index a7370bf1ffba33..970bc787bae1ea 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -48,13 +48,10 @@ '.', ], }, - 'defines': [ - 'HAVE_HIDDEN', - ], 'conditions': [ ['OS!="win"', { 'cflags!': [ '-ansi' ], - 'defines': [ 'Z_HAVE_UNISTD_H' ], + 'defines': [ 'Z_HAVE_UNISTD_H', 'HAVE_HIDDEN' ], }], ['OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="android"', { # Mac, Android and the BSDs don't have fopen64, ftello64, or