deps: reintroduce supporting shared c-ares builds#5775

jbergstroem · 2016-03-18T00:48:04Z

Pull Request check-list

Does make -j8 test (UNIX) or vcbuild test nosign (Windows) pass with
this change (including linting)?
Is the commit message formatted according to CONTRIBUTING.md?
If this change fixes a bug (or a performance problem), is a regression
test (or a benchmark) included?
Is a documentation update included (if this change modifies
existing APIs, or introduces new ones)?

Affected core subsystem(s)

build, deps

Description of change

As of cc192f0e we've now in sync with upstream which means that we also can allow our users to build against a shared version of c-ares.

Note: It is still up to users to make sure that the library version is on par with what Node.js bundles.

This "reverts" commit 25fa5c4.

Tested on gentoo with a shared version c-ares. Tests pass.

/CC @indutny, @bnoordhuis

jbergstroem · 2016-03-18T00:49:48Z

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

indutny · 2016-03-18T00:50:55Z

LGTM if it works. Thank you!

jbergstroem · 2016-03-18T00:55:55Z

(@nodejs/build should probably be CC:ed as well)

bnoordhuis · 2016-03-18T09:03:47Z

node.gyp

We previously called it node_shared_cares and it might be nice to keep that name in the (admittedly unlikely) case that people check for process.config.variables.node_shared_cares.

The reason it's changed is that we now use the shared configure_library so I have to map it to what the .pc file contains. Should be fixable though.

jasnell · 2016-03-18T17:28:35Z

LGTM

jbergstroem · 2016-03-21T06:14:02Z

@bnoordhuis just pushed a version that uses the old name.

To test this "properly" you likely have to build c-ares with ./configure -enable-symbol-hiding; otherwise c-ares will suffix the exposed api. In short: the homebrew version won't work.

jbergstroem · 2016-03-21T06:17:11Z

Here's some output from a gentoo-system, (built with: ./configure --shared-cares --shared-zlib --shared-openssl --shared-http-parser --shared-libuv):

(staging) ~/node-v5.9.0 $ ldd node linux-vdso.so.1 (0x00007ffef2ba9000) libz.so.1 => /lib64/libz.so.1 (0x00007fe083064000) libhttp_parser.so.2.6.2 => /usr/lib64/libhttp_parser.so.2.6.2 (0x00007fe082e5c000) libuv.so.1 => /usr/lib64/libuv.so.1 (0x00007fe082c38000) librt.so.1 => /lib64/librt.so.1 (0x00007fe082a30000) libpthread.so.0 => /lib64/libpthread.so.0 (0x00007fe082814000) libnsl.so.1 => /lib64/libnsl.so.1 (0x00007fe0825fc000) libdl.so.2 => /lib64/libdl.so.2 (0x00007fe0823f8000) libcares.so.2 => /usr/lib64/libcares.so.2 (0x00007fe0821e6000) libssl.so.1.0.0 => /usr/lib64/libssl.so.1.0.0 (0x00007fe081f70000) libcrypto.so.1.0.0 => /usr/lib64/libcrypto.so.1.0.0 (0x00007fe081b34000) libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/5.3.0/libstdc++.so.6 (0x00007fe0817b2000) libm.so.6 => /lib64/libm.so.6 (0x00007fe0814bc000) libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/5.3.0/libgcc_s.so.1 (0x00007fe0812a5000) libc.so.6 => /lib64/libc.so.6 (0x00007fe080f09000) /lib64/ld-linux-x86-64.so.2 (0x00007fe08327a000) (staging) ~/node-v5.9.0 $ make check make -C out BUILDTYPE=Release V=1 make[1]: Entering directory '/home/jbergstroem/node-v5.9.0/out' make[1]: Nothing to be donefor'all'. make[1]: Leaving directory '/home/jbergstroem/node-v5.9.0/out' ln -fs out/Release/node node Running main() from gtest_main.cc [==========] Running 1 test from 1 test case. [----------] Global test environment set-up. [----------] 1 test from UtilTest [ RUN ] UtilTest.ListHead [ OK ] UtilTest.ListHead (0 ms) [----------] 1 test from UtilTest (0 ms total) [----------] Global test environment tear-down [==========] 1 test from 1 testcase ran. (0 ms total) [ PASSED ] 1 test. /usr/lib/python-exec/python2.7/python tools/test.py --mode=release message parallel sequential -J [01:39|% 100|+ 1046|- 0]: Done

bnoordhuis · 2016-03-21T11:27:40Z

configure

Four space indent.

We have a lot of stuff doing 2. Should we perhaps pep8 configure in a separate PR?

I'm no fan of lint commits, but I like new code to have proper indentation.

jbergstroem · 2016-03-27T09:00:04Z

@bnoordhuis ok with the latest revision?

saghul · 2016-03-29T20:59:27Z

FWIW, upstream does not include this patch: 72c5458

jbergstroem · 2016-03-29T21:08:56Z

@saghul yeah, its known. Thanks for the notice though.

Edit: the reason at least I don't care much is because we don't build shared libraries on Windows.

jbergstroem · 2016-04-04T23:54:35Z

ping @bnoordhuis.

bnoordhuis · 2016-04-05T09:16:45Z

LGTM. Sorry for the delay.

jbergstroem · 2016-04-05T09:27:06Z

One more CI: https://ci.nodejs.org/job/node-test-commit/2800/

As of cc192f0e we've now in sync with upstream which means that we also can allow our users to build against a shared version of c-ares. Note: It is still up to users to make sure that the library version is on par with what Node.js bundles. This "reverts" commit 25fa5c4. PR-URL: nodejs#5775 Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>

The following significant (semver-major) changes have been made since the previous Node v5.0.0 release. * Buffer * New Buffer constructors have been added [#4682](#4682) * Previously deprecated Buffer APIs are removed [#5048](#5048), [#4594](#4594) * Improved error handling [#4514](#4514) * Cluster * Worker emitted as first argument in 'message' event [#5361](#5361). * Crypto * Improved error handling [#3100](#3100), [#5611](#5611) * Simplified Certificate class bindings [#5382](#5382) * Improved control over FIPS mode [#5181](#5181) * pbkdf2 digest overloading is deprecated [#4047](#4047) * Dependencies * Reintroduce shared c-ares build support [#5775](#5775). * V8 updated to 5.0.71.31 [#6111](#6111). * DNS * Add resolvePtr API to query plain DNS PTR records [#4921](#4921). * Domains * Clear stack when no error handler [#4659](#4659). * File System * The `fs.realpath()` and `fs.realpathSync()` methods have been updated to use a more efficient libuv implementation. This change includes the removal of the `cache` argument and the method can throw new errors [#3594](#3594) * FS apis can now accept and return paths as Buffers [#5616](#5616). * Error handling and type checking improvements [#5616](#5616), [#5590](#5590), [#4518](#4518), [#3917](#3917). * fs.read's string interface is deprecated [#4525](#4525) * HTTP * 'clientError' can now be used to return custom errors from an HTTP server [#4557](#4557). * Modules * Current directory is now prioritized for local lookups [#5689](#5689) * Symbolic links are preserved when requiring modules [#5950](#5950) * Net * DNS hints no longer implicitly set [#6021](#6021). * Improved error handling and type checking [#5981](#5981), [#5733](#5733), [#2904](#2904) * Path * Improved type checking [#5348](#5348). * Process * Introduce process warnings API [#4782](#4782). * Throw exception when non-function passed to nextTick [#3860](#3860). * Readline * Emit key info unconditionally [#6024](#6024) * REPL * Assignment to `_` will emit a warning. [#5535](#5535) * Timers * Fail early when callback is not a function [#4362](#4362) * TLS * Rename 'clientError' to 'tlsClientError' [#4557](#4557) * SHA1 used for sessionIdContext [#3866](#3866) * TTY * Previously deprecated setRawMode wrapper is removed [#2528](#2528). * Util * Changes to Error object formatting [#4582](#4582). * Windows * Windows XP and Vista are no longer supported [#5167](#5167), [#5167](#5167).

The following significant (semver-major) changes have been made since the previous Node v5.0.0 release. * Buffer * New Buffer constructors have been added [#4682](#4682) * Previously deprecated Buffer APIs are removed [#5048](#5048), [#4594](#4594) * Improved error handling [#4514](#4514) * Cluster * Worker emitted as first argument in 'message' event [#5361](#5361). * Crypto * Improved error handling [#3100](#3100), [#5611](#5611) * Simplified Certificate class bindings [#5382](#5382) * Improved control over FIPS mode [#5181](#5181) * pbkdf2 digest overloading is deprecated [#4047](#4047) * Dependencies * Reintroduce shared c-ares build support [#5775](#5775). * V8 updated to 5.0.71.31 [#6111](#6111). * DNS * Add resolvePtr API to query plain DNS PTR records [#4921](#4921). * Domains * Clear stack when no error handler [#4659](#4659). * File System * The `fs.realpath()` and `fs.realpathSync()` methods have been updated to use a more efficient libuv implementation. This change includes the removal of the `cache` argument and the method can throw new errors [#3594](#3594) * FS apis can now accept and return paths as Buffers [#5616](#5616). * Error handling and type checking improvements [#5616](#5616), [#5590](#5590), [#4518](#4518), [#3917](#3917). * fs.read's string interface is deprecated [#4525](#4525) * HTTP * 'clientError' can now be used to return custom errors from an HTTP server [#4557](#4557). * Modules * Current directory is now prioritized for local lookups [#5689](#5689) * Symbolic links are preserved when requiring modules [#5950](#5950) * Net * DNS hints no longer implicitly set [#6021](#6021). * Improved error handling and type checking [#5981](#5981), [#5733](#5733), [#2904](#2904) * OS X * MACOSX_DEPLOYMENT_TARGET has been bumped up to 10.7 [#6402](#6402). * Path * Improved type checking [#5348](#5348). * Process * Introduce process warnings API [#4782](#4782). * Throw exception when non-function passed to nextTick [#3860](#3860). * Readline * Emit key info unconditionally [#6024](#6024) * REPL * Assignment to `_` will emit a warning. [#5535](#5535) * Timers * Fail early when callback is not a function [#4362](#4362) * TLS * Rename 'clientError' to 'tlsClientError' [#4557](#4557) * SHA1 used for sessionIdContext [#3866](#3866) * TTY * Previously deprecated setRawMode wrapper is removed [#2528](#2528). * Util * Changes to Error object formatting [#4582](#4582). * Windows * Windows XP and Vista are no longer supported [#5167](#5167), [#5167](#5167).

jbergstroem added the build Issues and PRs related to build files or the CI. label Mar 18, 2016

mscdex added dns Issues and PRs related to the dns subsystem. c++ Issues and PRs that require attention from people who are familiar with C++. labels Mar 18, 2016

bnoordhuis reviewed Mar 18, 2016
View reviewed changes

bnoordhuis reviewed Mar 21, 2016
View reviewed changes

jbergstroem added the semver-major PRs that contain breaking changes and should be released in the next major version. label Mar 29, 2016

jbergstroem force-pushed the feature/revert-shared-cares-25fa5c4c branch from 63a23fa to c89a49dCompare April 5, 2016 09:24

jbergstroem force-pushed the feature/revert-shared-cares-25fa5c4c branch from c89a49d to 2253be9Compare April 5, 2016 09:55

jbergstroem merged commit 2253be9 into nodejs:masterApr 5, 2016

jasnell mentioned this pull request Apr 19, 2016
What is new in v6? #6264
Closed

jasnell mentioned this pull request Apr 26, 2016
2016-04-26, Version 6.0.0 (Current) Release #6383
Closed

chrmoritz mentioned this pull request Apr 27, 2016
node 6.0.0 Homebrew/homebrew-core#633
Closed
4 tasks

Uh oh!

deps: reintroduce supporting shared c-ares builds#5775

deps: reintroduce supporting shared c-ares builds #5775

Conversation

jbergstroem commented Mar 18, 2016

Pull Request check-list

Affected core subsystem(s)

Description of change

Uh oh!

jbergstroem commented Mar 18, 2016

Uh oh!

indutny commented Mar 18, 2016

Uh oh!

jbergstroem commented Mar 18, 2016

Uh oh!

bnoordhuisMar 18, 2016

Choose a reason for hiding this comment

Uh oh!

jbergstroemMar 21, 2016

Choose a reason for hiding this comment

Uh oh!

jasnell commented Mar 18, 2016

Uh oh!

jbergstroem commented Mar 21, 2016

Uh oh!

jbergstroem commented Mar 21, 2016

Uh oh!

bnoordhuisMar 21, 2016

Choose a reason for hiding this comment

Uh oh!

jbergstroemMar 21, 2016

Choose a reason for hiding this comment

Uh oh!

bnoordhuisMar 21, 2016

Choose a reason for hiding this comment

Uh oh!

jbergstroem commented Mar 27, 2016

Uh oh!

saghul commented Mar 29, 2016

Uh oh!

jbergstroem commented Mar 29, 2016

Uh oh!

jbergstroem commented Apr 4, 2016

Uh oh!

bnoordhuis commented Apr 5, 2016

Uh oh!

jbergstroem commented Apr 5, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants