-
Notifications
You must be signed in to change notification settings - Fork 29.9k
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.
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
build: include the libuv and zlib into node #18383
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM if CI is happy:
This test case failed on Windows: |
node.gypi
Outdated
}, | ||
}, | ||
'conditions': [ | ||
['OS in "linux freebsd openbsd solaris android" and ' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ldflags
applies only to platforms that aren't Windows or MacOS so this is better written as OS != "aix"
, which I think the intent was? Likewise on line 165.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes and changed.
node.gypi
Outdated
'conditions': [ | ||
['OS in "linux freebsd" and node_shared=="false"', { | ||
'ldflags': [ | ||
'-Wl,--whole-archive,' | ||
'<(OBJ_DIR)/deps/openssl/' | ||
'<(OPENSSL_PRODUCT)', | ||
'<(OBJ_DIR)/deps/openssl/<(OPENSSL_PRODUCT)', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you indent here? It's a line (and string) continuation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch and done
a95449d
to
44dbb2d
Compare
updated the change based on @bnoordhuis comments |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, LGTM. CI: https://ci.nodejs.org/job/node-test-pull-request/12804/
Looks like the error of AIX shows up in other PR. is the AIX env for CI broken? |
Infrastructure issue. Let's try it one more time for good luck: https://ci.nodejs.org/job/node-test-commit/15775/ There's also this but I can't say if it's caused by this PR:
|
Not a happy run either... the alpine buildbot failure is most likely a flaky test but I don't immediately see why the linuxone run failed and the aix buildbot still has infrastructure issues. cc @nodejs/build - known issue? |
the weird thing is I can't tell the root cause from the console log (the linuxone) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Another CI run: https://ci.nodejs.org/job/node-test-pull-request/12853/ |
This is another CI run, https://ci.nodejs.org/job/node-test-commit/15831/ |
In the last CI run there were failures on debian, but this unrelated PR has the excact same failures: https://ci.nodejs.org/job/node-test-commit-linux/15991/nodes=debian8-64/console. That and the fact that some earlier CI runs for this PR did not have failures on debian mean that I believe the CI run is good. |
@yhwang would you be so kind and rebase? :-) |
44dbb2d
to
cae3458
Compare
@BridgeAR thanks for the reminding. rebase is done. Please kick off a CI. |
cae3458
to
90d5c48
Compare
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Fixes: nodejs#17444 Signed-off-by: Yihong Wang <[email protected]>
90d5c48
to
3a24b71
Compare
one failure: |
Landed in d161625 |
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: #17444 PR-URL: #18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Should this be backported to |
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: nodejs#17444 PR-URL: nodejs#18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: #17444 PR-URL: #18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: #17444 PR-URL: #18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: nodejs#17444 PR-URL: nodejs#18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
I’ve landed this as 4f21b66 in v8.x-staging because, as I understand it, it applies there as well – let me know if that was a mistake. |
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: #17444 PR-URL: #18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Add libuv and zlib into node executable and shared lib. Also fix an issue that openssl is not fully included in node executable for macOS. Signed-off-by: Yihong Wang <[email protected]> Fixes: #17444 PR-URL: #18383 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
Add libuv and zlib into node executable and shared lib. Also fix an
issue that openssl is not fully included in node executable for macOS.
fixes #17444
Signed-off-by: Yihong Wang [email protected]
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passesAffected core subsystem(s)
build