Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: don't bundle deps/zlib if --shared-zlib set #10657

Merged
merged 1 commit into from
Jan 29, 2017
Merged

build: don't bundle deps/zlib if --shared-zlib set #10657

merged 1 commit into from
Jan 29, 2017

Conversation

gibfahn
Copy link
Member

@gibfahn gibfahn commented Jan 6, 2017 •
edited
Loading

Even if the --shared-zlib flag was used, the bundled deps/zlib was still
being compiled into the binary as it was required by the C++ test suite.

Fixes: #10649

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

build, zlib

cc/ @bnoordhuis

@gibfahn gibfahn added build Issues and PRs related to build files or the CI. wip Issues and PRs that are still a work in progress. zlib Issues and PRs related to the zlib subsystem. labels Jan 6, 2017
@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Jan 6, 2017
@gibfahn
Copy link
Member Author

gibfahn commented Jan 6, 2017

I have confirmed that this no longer compiles zlib in

Before:

$ git checkout master && make clean && ./configure --shared-zlib && make -j120 2>&1 | grep zlib
Already on 'master'
rm -rf out/Makefile node node_g out/Release/node \
                out/Release/node.exp
rm -rf node_modules
rm -f test.tap
creating ./icu_config.gypi
* Using ICU in deps/icu-small
Using version-specific floating patch tools/icu/patches/58/source/i18n/digitlst.cpp
creating ./icu_config.gypi
{ 'target_defaults': { 'cflags': [],
                       'default_configuration': 'Release',
                       'defines': [],
                       'include_dirs': [],
                       'libraries': ['-lz']},
  'variables': { 'asan': 0,
                 'coverage': 'false',
                 'debug_devtools': 'node',
                 'force_dynamic_crt': 0,
                 'gas_version': '2.23',
                 'host_arch': 'x64',
                 'icu_data_file': 'icudt58l.dat',
                 'icu_data_in': '../../deps/icu-small/source/data/in/icudt58l.dat',
                 'icu_endianness': 'l',
                 'icu_gyp_path': 'tools/icu/icu-generic.gyp',
                 'icu_locales': 'en,root',
                 'icu_path': 'deps/icu-small',
                 'icu_small': 'true',
                 'icu_ver_major': '58',
                 'node_byteorder': 'little',
                 'node_enable_d8': 'false',
                 'node_enable_v8_vtunejit': 'false',
                 'node_install_npm': 'true',
                 'node_module_version': 51,
                 'node_no_browser_globals': 'false',
                 'node_prefix': '/usr/local',
                 'node_release_urlbase': '',
                 'node_shared': 'false',
                 'node_shared_cares': 'false',
                 'node_shared_http_parser': 'false',
                 'node_shared_libuv': 'false',
                 'node_shared_openssl': 'false',
                 'node_shared_zlib': 'true',
                 'node_tag': '',
                 'node_use_bundled_v8': 'true',
                 'node_use_dtrace': 'false',
                 'node_use_etw': 'false',
                 'node_use_lttng': 'false',
                 'node_use_openssl': 'true',
                 'node_use_perfctr': 'false',
                 'node_use_v8_platform': 'true',
                 'openssl_fips': '',
                 'openssl_no_asm': 0,
                 'shlib_suffix': 'so.51',
                 'target_arch': 'x64',
                 'uv_parent_path': '/deps/uv/',
                 'uv_use_dtrace': 'false',
                 'v8_enable_gdbjit': 0,
                 'v8_enable_i18n_support': 1,
                 'v8_inspector': 'true',
                 'v8_no_strict_aliasing': 1,
                 'v8_optimized_debug': 0,
                 'v8_random_seed': 0,
                 'v8_use_snapshot': 'true',
                 'want_separate_host_toolset': 0,
                 'want_separate_host_toolset_mkpeephole': 0}}
creating ./config.gypi
creating ./config.mk
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/adler32.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/adler32.o ../deps/zlib/adler32.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/compress.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/compress.o ../deps/zlib/compress.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/crc32.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/crc32.o ../deps/zlib/crc32.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/deflate.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/deflate.o ../deps/zlib/deflate.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzclose.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzclose.o ../deps/zlib/gzclose.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzlib.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzlib.o ../deps/zlib/gzlib.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzread.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzread.o ../deps/zlib/gzread.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzwrite.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzwrite.o ../deps/zlib/gzwrite.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/infback.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/infback.o ../deps/zlib/infback.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inffast.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inffast.o ../deps/zlib/inffast.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inflate.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inflate.o ../deps/zlib/inflate.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inftrees.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inftrees.o ../deps/zlib/inftrees.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/trees.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/trees.o ../deps/zlib/trees.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/uncompr.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/uncompr.o ../deps/zlib/uncompr.c
  cc '-DZ_HAVE_UNISTD_H' -I../deps/zlib  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer  -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/zutil.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/zutil.o ../deps/zlib/zutil.c
  LD_LIBRARY_PATH=/tmp/gib/node/out/Release/lib.host:/tmp/gib/node/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../.; mkdir -p /tmp/gib/node/out/Release/obj/gen; python tools/js2c.py "/tmp/gib/node/out/Release/obj/gen/node_natives.h" lib/internal/bootstrap_node.js lib/_debug_agent.js lib/_debugger.js lib/assert.js lib/buffer.js lib/child_process.js lib/console.js lib/constants.js lib/crypto.js lib/cluster.js lib/dgram.js lib/dns.js lib/domain.js lib/events.js lib/fs.js lib/http.js lib/_http_agent.js lib/_http_client.js lib/_http_common.js lib/_http_incoming.js lib/_http_outgoing.js lib/_http_server.js lib/https.js lib/_linklist.js lib/module.js lib/net.js lib/os.js lib/path.js lib/process.js lib/punycode.js lib/querystring.js lib/readline.js lib/repl.js lib/stream.js lib/_stream_readable.js lib/_stream_writable.js lib/_stream_duplex.js lib/_stream_transform.js lib/_stream_passthrough.js lib/_stream_wrap.js lib/string_decoder.js lib/sys.js lib/timers.js lib/tls.js lib/_tls_common.js lib/_tls_legacy.js lib/_tls_wrap.js lib/tty.js lib/url.js lib/util.js lib/v8.js lib/vm.js lib/zlib.js lib/internal/buffer.js lib/internal/child_process.js lib/internal/cluster.js lib/internal/freelist.js lib/internal/fs.js lib/internal/linkedlist.js lib/internal/net.js lib/internal/module.js lib/internal/process/next_tick.js lib/internal/process/promises.js lib/internal/process/stdio.js lib/internal/process/warning.js lib/internal/process.js lib/internal/readline.js lib/internal/repl.js lib/internal/socket_list.js lib/internal/url.js lib/internal/util.js lib/internal/v8_prof_polyfill.js lib/internal/v8_prof_processor.js lib/internal/streams/lazy_transform.js lib/internal/streams/BufferList.js deps/v8/tools/splaytree.js deps/v8/tools/codemap.js deps/v8/tools/consarray.js deps/v8/tools/csvparser.js deps/v8/tools/profile.js deps/v8/tools/profile_view.js deps/v8/tools/logreader.js deps/v8/tools/tickprocessor.js deps/v8/tools/SourceMap.js deps/v8/tools/tickprocessor-driver.js ./config.gypi src/notrace_macros.py src/nolttng_macros.py src/perfctr_macros.py
  rm -f /tmp/gib/node/out/Release/obj.target/deps/zlib/libzlib.a && ar crsT /tmp/gib/node/out/Release/obj.target/deps/zlib/libzlib.a /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/adler32.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/compress.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/crc32.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/deflate.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzclose.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzlib.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzread.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/gzwrite.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/infback.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inffast.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inflate.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/inftrees.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/trees.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/uncompr.o /tmp/gib/node/out/Release/obj.target/zlib/deps/zlib/zutil.o
  g++ '-DGTEST_DONT_DEFINE_ASSERT_EQ=1' '-DGTEST_DONT_DEFINE_ASSERT_GE=1' '-DGTEST_DONT_DEFINE_ASSERT_GT=1' '-DGTEST_DONT_DEFINE_ASSERT_LE=1' '-DGTEST_DONT_DEFINE_ASSERT_LT=1' '-DGTEST_DONT_DEFINE_ASSERT_NE=1' '-DNODE_WANT_INTERNALS=1' '-DHAVE_INSPECTOR=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../deps/v8/include -I/tmp/gib/node/out/Release/obj/gen -I../deps/gtest/include -I../deps/zlib -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/cctest/test/cctest/util.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/util.o ../test/cctest/util.cc
  g++ '-DGTEST_DONT_DEFINE_ASSERT_EQ=1' '-DGTEST_DONT_DEFINE_ASSERT_GE=1' '-DGTEST_DONT_DEFINE_ASSERT_GT=1' '-DGTEST_DONT_DEFINE_ASSERT_LE=1' '-DGTEST_DONT_DEFINE_ASSERT_LT=1' '-DGTEST_DONT_DEFINE_ASSERT_NE=1' '-DNODE_WANT_INTERNALS=1' '-DHAVE_INSPECTOR=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../deps/v8/include -I/tmp/gib/node/out/Release/obj/gen -I../deps/gtest/include -I../deps/zlib -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket.o ../src/inspector_socket.cc
  g++ '-DGTEST_DONT_DEFINE_ASSERT_EQ=1' '-DGTEST_DONT_DEFINE_ASSERT_GE=1' '-DGTEST_DONT_DEFINE_ASSERT_GT=1' '-DGTEST_DONT_DEFINE_ASSERT_LE=1' '-DGTEST_DONT_DEFINE_ASSERT_LT=1' '-DGTEST_DONT_DEFINE_ASSERT_NE=1' '-DNODE_WANT_INTERNALS=1' '-DHAVE_INSPECTOR=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../deps/v8/include -I/tmp/gib/node/out/Release/obj/gen -I../deps/gtest/include -I../deps/zlib -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket_server.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket_server.o ../src/inspector_socket_server.cc
  g++ '-DGTEST_DONT_DEFINE_ASSERT_EQ=1' '-DGTEST_DONT_DEFINE_ASSERT_GE=1' '-DGTEST_DONT_DEFINE_ASSERT_GT=1' '-DGTEST_DONT_DEFINE_ASSERT_LE=1' '-DGTEST_DONT_DEFINE_ASSERT_LT=1' '-DGTEST_DONT_DEFINE_ASSERT_NE=1' '-DNODE_WANT_INTERNALS=1' '-DHAVE_INSPECTOR=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../deps/v8/include -I/tmp/gib/node/out/Release/obj/gen -I../deps/gtest/include -I../deps/zlib -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket.o ../test/cctest/test_inspector_socket.cc
  g++ '-DGTEST_DONT_DEFINE_ASSERT_EQ=1' '-DGTEST_DONT_DEFINE_ASSERT_GE=1' '-DGTEST_DONT_DEFINE_ASSERT_GT=1' '-DGTEST_DONT_DEFINE_ASSERT_LE=1' '-DGTEST_DONT_DEFINE_ASSERT_LT=1' '-DGTEST_DONT_DEFINE_ASSERT_NE=1' '-DNODE_WANT_INTERNALS=1' '-DHAVE_INSPECTOR=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../deps/v8/include -I/tmp/gib/node/out/Release/obj/gen -I../deps/gtest/include -I../deps/zlib -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket_server.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket_server.o ../test/cctest/test_inspector_socket_server.cc
  g++ '-DNODE_ARCH="x64"' '-DNODE_PLATFORM="linux"' '-DNODE_WANT_INTERNALS=1' '-DV8_DEPRECATION_WARNINGS=1' '-DNODE_USE_V8_PLATFORM=1' '-DNODE_HAVE_I18N_SUPPORT=1' '-DNODE_HAVE_SMALL_ICU=1' '-DHAVE_INSPECTOR=1' '-DHAVE_OPENSSL=1' '-D__POSIX__' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_STATIC_IMPLEMENTATION=1' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' '-DUCONFIG_NO_LEGACY_CONVERSION=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../tools/msvs/genfiles -I../deps/uv/src/ares -I/tmp/gib/node/out/Release/obj/gen -I../deps/v8_inspector/include -I/tmp/gib/node/out/Release/obj/gen/include -I../deps/v8/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/cares/include -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o ../src/node_zlib.cc
  g++ -pthread -rdynamic -m64 -pthread  -o /tmp/gib/node/out/Release/cctest -Wl,--start-group /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/util.o /tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket.o /tmp/gib/node/out/Release/obj.target/cctest/src/inspector_socket_server.o /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket.o /tmp/gib/node/out/Release/obj.target/cctest/test/cctest/test_inspector_socket_server.o /tmp/gib/node/out/Release/obj.target/deps/gtest/libgtest.a /tmp/gib/node/out/Release/obj.target/deps/zlib/libzlib.a /tmp/gib/node/out/Release/obj.target/deps/openssl/libopenssl.a /tmp/gib/node/out/Release/obj.target/deps/http_parser/libhttp_parser.a /tmp/gib/node/out/Release/obj.target/deps/uv/libuv.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libplatform.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libbase.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_base.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libsampler.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicui18n.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicuucx.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicudata.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicustubdata.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_snapshot.a -Wl,--end-group -lz -lm -ldl -lrt
  g++ -pthread -rdynamic -m64 -Wl,--whole-archive,/tmp/gib/node/out/Release/obj.target/deps/openssl/libopenssl.a -Wl,--no-whole-archive -Wl,-z,noexecstack -Wl,--whole-archive /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_base.a -Wl,--no-whole-archive -pthread  -o /tmp/gib/node/out/Release/node -Wl,--start-group /tmp/gib/node/out/Release/obj.target/node/src/tracing/agent.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/node_trace_buffer.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/node_trace_writer.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/trace_event.o /tmp/gib/node/out/Release/obj.target/node/src/debug-agent.o /tmp/gib/node/out/Release/obj.target/node/src/async-wrap.o /tmp/gib/node/out/Release/obj.target/node/src/env.o /tmp/gib/node/out/Release/obj.target/node/src/fs_event_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/cares_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/connection_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/connect_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/handle_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/js_stream.o /tmp/gib/node/out/Release/obj.target/node/src/node.o /tmp/gib/node/out/Release/obj.target/node/src/node_buffer.o /tmp/gib/node/out/Release/obj.target/node/src/node_config.o /tmp/gib/node/out/Release/obj.target/node/src/node_constants.o /tmp/gib/node/out/Release/obj.target/node/src/node_contextify.o /tmp/gib/node/out/Release/obj.target/node/src/node_debug_options.o /tmp/gib/node/out/Release/obj.target/node/src/node_file.o /tmp/gib/node/out/Release/obj.target/node/src/node_http_parser.o /tmp/gib/node/out/Release/obj.target/node/src/node_javascript.o /tmp/gib/node/out/Release/obj.target/node/src/node_main.o /tmp/gib/node/out/Release/obj.target/node/src/node_os.o /tmp/gib/node/out/Release/obj.target/node/src/node_revert.o /tmp/gib/node/out/Release/obj.target/node/src/node_url.o /tmp/gib/node/out/Release/obj.target/node/src/node_util.o /tmp/gib/node/out/Release/obj.target/node/src/node_v8.o /tmp/gib/node/out/Release/obj.target/node/src/node_stat_watcher.o /tmp/gib/node/out/Release/obj.target/node/src/node_watchdog.o /tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o /tmp/gib/node/out/Release/obj.target/node/src/node_i18n.o /tmp/gib/node/out/Release/obj.target/node/src/pipe_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/signal_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/spawn_sync.o /tmp/gib/node/out/Release/obj.target/node/src/string_bytes.o /tmp/gib/node/out/Release/obj.target/node/src/stream_base.o /tmp/gib/node/out/Release/obj.target/node/src/stream_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/tcp_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/timer_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/tty_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/process_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/udp_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/uv.o /tmp/gib/node/out/Release/obj.target/node/src/util.o /tmp/gib/node/out/Release/obj.target/node/src/string_search.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_agent.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_socket.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_socket_server.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto_bio.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto_clienthello.o /tmp/gib/node/out/Release/obj.target/node/src/tls_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/backtrace_posix.o /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libplatform.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicui18n.a /tmp/gib/node/out/Release/obj.target/deps/v8_inspector/src/inspector/libstandalone_inspector.a /tmp/gib/node/out/Release/obj.target/deps/openssl/libopenssl.a /tmp/gib/node/out/Release/obj.target/deps/http_parser/libhttp_parser.a /tmp/gib/node/out/Release/obj.target/deps/cares/libcares.a /tmp/gib/node/out/Release/obj.target/deps/uv/libuv.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_base.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libbase.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libsampler.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicuucx.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicudata.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicustubdata.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_snapshot.a -Wl,--end-group -lz -ldl -lrt -lm

After:

$ git checkout share-zlib && make clean && ./configure --shared-zlib && make -j120 2>&1 | grep zlib
Switched to branch 'share-zlib'
rm -rf out/Makefile node node_g out/Release/node \
                out/Release/node.exp
rm -rf node_modules
rm -f test.tap
creating ./icu_config.gypi
* Using ICU in deps/icu-small
Using version-specific floating patch tools/icu/patches/58/source/i18n/digitlst.cpp
creating ./icu_config.gypi
{ 'target_defaults': { 'cflags': [],
                       'default_configuration': 'Release',
                       'defines': [],
                       'include_dirs': [],
                       'libraries': ['-lz']},
  'variables': { 'asan': 0,
                 'coverage': 'false',
                 'debug_devtools': 'node',
                 'force_dynamic_crt': 0,
                 'gas_version': '2.23',
                 'host_arch': 'x64',
                 'icu_data_file': 'icudt58l.dat',
                 'icu_data_in': '../../deps/icu-small/source/data/in/icudt58l.dat',
                 'icu_endianness': 'l',
                 'icu_gyp_path': 'tools/icu/icu-generic.gyp',
                 'icu_locales': 'en,root',
                 'icu_path': 'deps/icu-small',
                 'icu_small': 'true',
                 'icu_ver_major': '58',
                 'node_byteorder': 'little',
                 'node_enable_d8': 'false',
                 'node_enable_v8_vtunejit': 'false',
                 'node_install_npm': 'true',
                 'node_module_version': 51,
                 'node_no_browser_globals': 'false',
                 'node_prefix': '/usr/local',
                 'node_release_urlbase': '',
                 'node_shared': 'false',
                 'node_shared_cares': 'false',
                 'node_shared_http_parser': 'false',
                 'node_shared_libuv': 'false',
                 'node_shared_openssl': 'false',
                 'node_shared_zlib': 'true',
                 'node_tag': '',
                 'node_use_bundled_v8': 'true',
                 'node_use_dtrace': 'false',
                 'node_use_etw': 'false',
                 'node_use_lttng': 'false',
                 'node_use_openssl': 'true',
                 'node_use_perfctr': 'false',
                 'node_use_v8_platform': 'true',
                 'openssl_fips': '',
                 'openssl_no_asm': 0,
                 'shlib_suffix': 'so.51',
                 'target_arch': 'x64',
                 'uv_parent_path': '/deps/uv/',
                 'uv_use_dtrace': 'false',
                 'v8_enable_gdbjit': 0,
                 'v8_enable_i18n_support': 1,
                 'v8_inspector': 'true',
                 'v8_no_strict_aliasing': 1,
                 'v8_optimized_debug': 0,
                 'v8_random_seed': 0,
                 'v8_use_snapshot': 'true',
                 'want_separate_host_toolset': 0,
                 'want_separate_host_toolset_mkpeephole': 0}}
creating ./config.gypi
creating ./config.mk
  LD_LIBRARY_PATH=/tmp/gib/node/out/Release/lib.host:/tmp/gib/node/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../.; mkdir -p /tmp/gib/node/out/Release/obj/gen; python tools/js2c.py "/tmp/gib/node/out/Release/obj/gen/node_natives.h" lib/internal/bootstrap_node.js lib/_debug_agent.js lib/_debugger.js lib/assert.js lib/buffer.js lib/child_process.js lib/console.js lib/constants.js lib/crypto.js lib/cluster.js lib/dgram.js lib/dns.js lib/domain.js lib/events.js lib/fs.js lib/http.js lib/_http_agent.js lib/_http_client.js lib/_http_common.js lib/_http_incoming.js lib/_http_outgoing.js lib/_http_server.js lib/https.js lib/_linklist.js lib/module.js lib/net.js lib/os.js lib/path.js lib/process.js lib/punycode.js lib/querystring.js lib/readline.js lib/repl.js lib/stream.js lib/_stream_readable.js lib/_stream_writable.js lib/_stream_duplex.js lib/_stream_transform.js lib/_stream_passthrough.js lib/_stream_wrap.js lib/string_decoder.js lib/sys.js lib/timers.js lib/tls.js lib/_tls_common.js lib/_tls_legacy.js lib/_tls_wrap.js lib/tty.js lib/url.js lib/util.js lib/v8.js lib/vm.js lib/zlib.js lib/internal/buffer.js lib/internal/child_process.js lib/internal/cluster.js lib/internal/freelist.js lib/internal/fs.js lib/internal/linkedlist.js lib/internal/net.js lib/internal/module.js lib/internal/process/next_tick.js lib/internal/process/promises.js lib/internal/process/stdio.js lib/internal/process/warning.js lib/internal/process.js lib/internal/readline.js lib/internal/repl.js lib/internal/socket_list.js lib/internal/url.js lib/internal/util.js lib/internal/v8_prof_polyfill.js lib/internal/v8_prof_processor.js lib/internal/streams/lazy_transform.js lib/internal/streams/BufferList.js deps/v8/tools/splaytree.js deps/v8/tools/codemap.js deps/v8/tools/consarray.js deps/v8/tools/csvparser.js deps/v8/tools/profile.js deps/v8/tools/profile_view.js deps/v8/tools/logreader.js deps/v8/tools/tickprocessor.js deps/v8/tools/SourceMap.js deps/v8/tools/tickprocessor-driver.js ./config.gypi src/notrace_macros.py src/nolttng_macros.py src/perfctr_macros.py
  g++ '-DNODE_ARCH="x64"' '-DNODE_PLATFORM="linux"' '-DNODE_WANT_INTERNALS=1' '-DV8_DEPRECATION_WARNINGS=1' '-DNODE_USE_V8_PLATFORM=1' '-DNODE_HAVE_I18N_SUPPORT=1' '-DNODE_HAVE_SMALL_ICU=1' '-DHAVE_INSPECTOR=1' '-DHAVE_OPENSSL=1' '-D__POSIX__' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_STATIC_IMPLEMENTATION=1' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' '-DUCONFIG_NO_LEGACY_CONVERSION=1' '-DHTTP_PARSER_STRICT=0' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D_POSIX_C_SOURCE=200112' -I../src -I../tools/msvs/genfiles -I../deps/uv/src/ares -I/tmp/gib/node/out/Release/obj/gen -I../deps/v8_inspector/include -I/tmp/gib/node/out/Release/obj/gen/include -I../deps/v8/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common -I../deps/openssl/openssl/include -I../deps/http_parser -I../deps/cares/include -I../deps/uv/include  -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF /tmp/gib/node/out/Release/.deps//tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o.d.raw   -c -o /tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o ../src/node_zlib.cc
  g++ -pthread -rdynamic -m64 -Wl,--whole-archive,/tmp/gib/node/out/Release/obj.target/deps/openssl/libopenssl.a -Wl,--no-whole-archive -Wl,-z,noexecstack -Wl,--whole-archive /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_base.a -Wl,--no-whole-archive -pthread  -o /tmp/gib/node/out/Release/node -Wl,--start-group /tmp/gib/node/out/Release/obj.target/node/src/tracing/agent.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/node_trace_buffer.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/node_trace_writer.o /tmp/gib/node/out/Release/obj.target/node/src/tracing/trace_event.o /tmp/gib/node/out/Release/obj.target/node/src/debug-agent.o /tmp/gib/node/out/Release/obj.target/node/src/async-wrap.o /tmp/gib/node/out/Release/obj.target/node/src/env.o /tmp/gib/node/out/Release/obj.target/node/src/fs_event_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/cares_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/connection_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/connect_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/handle_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/js_stream.o /tmp/gib/node/out/Release/obj.target/node/src/node.o /tmp/gib/node/out/Release/obj.target/node/src/node_buffer.o /tmp/gib/node/out/Release/obj.target/node/src/node_config.o /tmp/gib/node/out/Release/obj.target/node/src/node_constants.o /tmp/gib/node/out/Release/obj.target/node/src/node_contextify.o /tmp/gib/node/out/Release/obj.target/node/src/node_debug_options.o /tmp/gib/node/out/Release/obj.target/node/src/node_file.o /tmp/gib/node/out/Release/obj.target/node/src/node_http_parser.o /tmp/gib/node/out/Release/obj.target/node/src/node_javascript.o /tmp/gib/node/out/Release/obj.target/node/src/node_main.o /tmp/gib/node/out/Release/obj.target/node/src/node_os.o /tmp/gib/node/out/Release/obj.target/node/src/node_revert.o /tmp/gib/node/out/Release/obj.target/node/src/node_url.o /tmp/gib/node/out/Release/obj.target/node/src/node_util.o /tmp/gib/node/out/Release/obj.target/node/src/node_v8.o /tmp/gib/node/out/Release/obj.target/node/src/node_stat_watcher.o /tmp/gib/node/out/Release/obj.target/node/src/node_watchdog.o /tmp/gib/node/out/Release/obj.target/node/src/node_zlib.o /tmp/gib/node/out/Release/obj.target/node/src/node_i18n.o /tmp/gib/node/out/Release/obj.target/node/src/pipe_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/signal_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/spawn_sync.o /tmp/gib/node/out/Release/obj.target/node/src/string_bytes.o /tmp/gib/node/out/Release/obj.target/node/src/stream_base.o /tmp/gib/node/out/Release/obj.target/node/src/stream_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/tcp_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/timer_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/tty_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/process_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/udp_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/uv.o /tmp/gib/node/out/Release/obj.target/node/src/util.o /tmp/gib/node/out/Release/obj.target/node/src/string_search.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_agent.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_socket.o /tmp/gib/node/out/Release/obj.target/node/src/inspector_socket_server.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto_bio.o /tmp/gib/node/out/Release/obj.target/node/src/node_crypto_clienthello.o /tmp/gib/node/out/Release/obj.target/node/src/tls_wrap.o /tmp/gib/node/out/Release/obj.target/node/src/backtrace_posix.o /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libplatform.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicui18n.a /tmp/gib/node/out/Release/obj.target/deps/v8_inspector/src/inspector/libstandalone_inspector.a /tmp/gib/node/out/Release/obj.target/deps/openssl/libopenssl.a /tmp/gib/node/out/Release/obj.target/deps/http_parser/libhttp_parser.a /tmp/gib/node/out/Release/obj.target/deps/cares/libcares.a /tmp/gib/node/out/Release/obj.target/deps/uv/libuv.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_base.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libbase.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_libsampler.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicuucx.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicudata.a /tmp/gib/node/out/Release/obj.target/tools/icu/libicustubdata.a /tmp/gib/node/out/Release/obj.target/deps/v8/src/libv8_snapshot.a -Wl,--end-group -lz -ldl -lrt -lm

@gibfahn gibfahn removed the wip Issues and PRs that are still a work in progress. label Jan 8, 2017
@gibfahn gibfahn changed the title build: fix using shared zlib build: don't bundle deps/zlib if --shared-zlib set Jan 8, 2017
@jasnell
Copy link
Member

jasnell commented Jan 10, 2017

/cc @nodejs/build

@addaleax
Copy link
Member

CI: https://ci.nodejs.org/job/node-test-commit/7534/

bnoordhuis
bnoordhuis approved these changes Jan 29, 2017
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take-it-or-leave-it suggestion: s/bundle/build/ in the commit log, otherwise LGTM.

@gibfahn gibfahn self-assigned this Jan 29, 2017
@gibfahn
Copy link
Member Author

gibfahn commented Jan 29, 2017 •
edited
Loading

Take-it-or-leave-it suggestion: s/bundle/build/ in the commit log, otherwise LGTM.

Done

CI: https://ci.nodejs.org/job/node-test-commit/7544/

EDIT: Whoops, missed the other (green) CI.

@gibfahn
Copy link
Member Author

gibfahn commented Jan 29, 2017

CI issue looks like a flaky test (sequential/test-child-process-pass-fd on fedora24)

https://ci.nodejs.org/job/node-test-commit-linux/7574/nodes=fedora24/tapTestReport/test.tap-1326/

Test failure: 
not ok 1326 sequential/test-child-process-pass-fd
  ---
  duration_ms: 1.112
  severity: fail
  stack: |-
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: spawn /home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/out/Release/node EAGAIN
        at exports._errnoException (util.js:1023:11)
        at Process.ChildProcess._handle.onexit (internal/child_process.js:193:32)
        at onErrorNT (internal/child_process.js:359:16)
        at _combinedTickCallback (internal/process/next_tick.js:74:11)
        at process._tickCallback (internal/process/next_tick.js:98:9)
        at Module.runMain (module.js:607:11)
        at run (bootstrap_node.js:418:7)
        at startup (bootstrap_node.js:139:9)
        at bootstrap_node.js:533:3
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
    events.js:161
          throw er; // Unhandled 'error' event
          ^
    
    Error: channel closed
        at process.target.send (internal/child_process.js:553:16)
        at Socket.socketConnected (/home/iojs/build/workspace/node-test-commit-linux/nodes/fedora24/test/sequential/test-child-process-pass-fd.js:39:15)
        at Object.onceWrapper (events.js:291:19)
        at emitNone (events.js:86:13)
        at Socket.emit (events.js:186:7)
        at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1077:10)
  ...

@gibfahn
build: don't build deps/zlib if --shared-zlib set
ae21a51 
Even if the --shared-zlib flag was used, the bundled deps/zlib was still
being compiled into the binary as it was required by the C++ test suite.

PR-URL: nodejs#10657
Fixes: nodejs#10649
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@gibfahn gibfahn merged commit ae21a51 into nodejs:master Jan 29, 2017
@gibfahn gibfahn deleted the share-zlib branch January 29, 2017 22:44
TimothyGu added a commit to TimothyGu/node-review that referenced this pull request Jan 29, 2017
@TimothyGu
Only look for LGTMs in <p>'s
b834000 
Fixes: nodejs/node#10657
@TimothyGu TimothyGu mentioned this pull request Jan 30, 2017
Merged
evanlucas pushed a commit that referenced this pull request Jan 31, 2017
@gibfahn @evanlucas
build: don't build deps/zlib if --shared-zlib set
9c2f686 
Even if the --shared-zlib flag was used, the bundled deps/zlib was still
being compiled into the binary as it was required by the C++ test suite.

PR-URL: #10657
Fixes: #10649
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@italoacasas italoacasas mentioned this pull request Jan 31, 2017
Merged
TimothyGu added a commit to TimothyGu/node-review that referenced this pull request Feb 1, 2017
@TimothyGu
review: only look for LGTMs in <p>'s
ca1c671 
Fixes: nodejs/node#10657
evanlucas pushed a commit to nodejs/node-review that referenced this pull request Feb 6, 2017
@TimothyGu @evanlucas
Improvements (#7)
0b323f0 
* index: allow #fragments in PR URLs

Also check tightened PR_RE against pathname

* review: fix Metadata state operation

E.g. nodejs/node#10952

* review: simplify Fixes creation

* review: overhaul getCollaborators()

- Make regex static and more concise
- Iterate over RE.exec
- Use Map

* review: remove extra whitespace

Fixes: #5

* review: only look for LGTMs in <p>'s

Fixes: nodejs/node#10657
@jasnell
Copy link
Member

jasnell commented Mar 8, 2017

should this be backported to v6 or v4? If so, backport PRs will be needed.

@gibfahn gibfahn restored the share-zlib branch March 9, 2017 08:27
@gibfahn gibfahn deleted the share-zlib branch March 11, 2017 01:29
@gibfahn
Copy link
Member Author

gibfahn commented Mar 11, 2017

This fixes an issue in #9630, so not needed unless that PR is backported.

@gibfahn gibfahn mentioned this pull request Mar 11, 2017
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bnoordhuis bnoordhuis bnoordhuis approved these changes

@addaleax addaleax addaleax approved these changes

Assignees

@gibfahn gibfahn

Labels
build Issues and PRs related to build files or the CI. zlib Issues and PRs related to the zlib subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@gibfahn @jasnell @addaleax @bnoordhuis @MylesBorins @nodejs-github-bot