Skip to content

v6.17.1 proposal #26684

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

Merged
BethGriggs merged 8 commits into from
Apr 3, 2019
Merged

v6.17.1 proposal #26684

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aedc712
src: fix bootstrap_node on bsd
sylkat Sep 2, 2018
ad62971
doc: document that addMembership must be called once in a cluster
jasnell Oct 19, 2018
1371a6f
doc: simplify CODE_OF_CONDUCT.md
Trott Oct 31, 2018
9ba5fd6
build: only check REPLACEME & DEP...X for releases
rvagg May 11, 2017
b5d4649
test: fix test-repl-envvars
addaleax Dec 26, 2018
8080a9b
http: fix error check in `Execute()`
mscdex Feb 5, 2019
c9d21a0
build: set `-blibpath:` for AIX
richardlau Jan 11, 2019
576c2bf
2019-04-03, Version 6.17.1 'Boron' (LTS)
BethGriggs Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build: set -blibpath: for AIX 
#17604 refactored the gyp files
so that `-blibpath:` on AIX was only set if `node_shared=="true"`.
Restore the setting for non-shared builds.

Fixes: #25444

Backport-PR-URL: #26478
PR-URL: #25447
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
@richardlau @BethGriggs
richardlau authored and BethGriggs committed Mar 15, 2019
commit c9d21a0c10d54f77365690e99eaea64f86eaa8e8
24 changes: 22 additions & 2 deletions common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@
['OS=="aix"', {
'cflags': [ '-gxcoff' ],
'ldflags': [ '-Wl,-bbigtoc' ],
'conditions': [
['target_arch=="ppc64"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:'
'/opt/freeware/lib/pthread/ppc64'
],
}],
['target_arch=="ppc"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
],
}],
],
}],
['OS == "android"', {
'cflags': [ '-fPIE' ],
Expand Down Expand Up @@ -332,11 +345,18 @@
[ 'OS=="aix"', {
'conditions': [
[ 'target_arch=="ppc"', {
'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ],
'ldflags': [
'-Wl,-bmaxdata:0x60000000/dsa',
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
],
}],
[ 'target_arch=="ppc64"', {
'cflags': [ '-maix64' ],
'ldflags': [ '-maix64' ],
'ldflags': [
'-maix64',
'-Wl,-blibpath:/usr/lib:/lib:'
'/opt/freeware/lib/pthread/ppc64',
],
}],
],
'ldflags': [ '-Wl,-bbigtoc' ],
Expand Down