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.

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: add node_module_version to config.gypi #8027

Closed
wants to merge 3 commits into from

Conversation

saper
Copy link

@saper saper commented Aug 8, 2016

Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: nodejs/node-gyp#855

Work around spec violations in V8 where it checks that `this == NULL`.
GCC 6 started exploiting this particular kind of UB, resulting in
runtime crashes.

Fixes: nodejs#6724
PR-URL: nodejs#6737
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Back-port commit 76f40f7 ("test: stronger crypto in test fixtures") from
the master branch.

Pushes back the expiration date of test/fixtures/keys/ca2-crl.pem to
2018, fixing a CRL_HAS_EXPIRED error in simple/test-tls-server-verify.

Fixes: nodejs#7194
PR-URL: nodejs#7195
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Aug 8, 2016
@addaleax addaleax added the v0.12 label Aug 8, 2016
@saper
Copy link
Author

saper commented Aug 8, 2016

This is #7808 for v0.12

@saper saper force-pushed the node_module_vesion/v0.12 branch 2 times, most recently from 3bda6d3 to aab8896 Compare August 8, 2016 23:50
@mscdex
Copy link
Contributor

mscdex commented Aug 9, 2016

I believe PRs need to target the relevant -staging branch when applying to a version branch.

@MylesBorins
Copy link
Contributor

I believe that after today's LTS discussion it was decided that this would land in v4.x but we were not planning to backport to v0.10 or v0.12

/cc @nodejs/lts @rvagg

@saper
Copy link
Author

saper commented Aug 9, 2016

@mscdex I was checking git branch -rvv yesterday and I got lost a bit. There are also so many 5.x branches, some of them are ahead of 5.x. Is there any doc about it?

of course I am more than happy to cherry pick this somewhere else.

@mscdex
Copy link
Contributor

mscdex commented Aug 9, 2016

@saper Perhaps you're looking at old release branches? Each major version (including v0.10 and v0.12) has its own -staging (e.g. v4.x-staging) branch where new commits go to get merged into the major version branch (e.g. v4.x), which is where new releases get cut from for that line.

@saper
Copy link
Author

saper commented Aug 9, 2016

Most probably, yes. Will try to fix that, thanks for pointing that out.

@bnoordhuis
Copy link
Member

I believe that after today's LTS discussion it was decided that this would land in v4.x but we were not planning to backport to v0.10 or v0.12

Can you reconsider? This change makes it possible for add-on authors to detect the ABI version without gross v0.10/v0.12-specific hacks in their binding.gyp.

@jasnell
Copy link
Member

jasnell commented Aug 9, 2016

Yeah, I don't think anyone felt that strongly about not having it, it was just more a bias towards leaving it as is since both are coming up to end-of-life soon. If there's a good enough justification then why not? :-)

@saper saper changed the title build: Provide 'node_module_version' via config.gypi build: add node_module_version to config.gypi Aug 18, 2016
@saper saper changed the base branch from v0.12 to v0.12-staging August 18, 2016 22:18
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
saper added a commit to saper/node that referenced this pull request Aug 19, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8171
Ref: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
jasnell pushed a commit that referenced this pull request Aug 22, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Sep 28, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@bnoordhuis
Copy link
Member

@nodejs/lts Is this still on track for inclusion in a v0.12 release?

@jasnell
Copy link
Member

jasnell commented Oct 7, 2016

LGTM with green CI. Once it lands in v0.12-staging it should go out with whatever the next v0.12 release happens to be.

rvagg pushed a commit that referenced this pull request Oct 18, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Oct 26, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@rvagg
Copy link
Member

rvagg commented Dec 20, 2016

not gonna make it sorry

@rvagg rvagg closed this Dec 20, 2016
@bnoordhuis
Copy link
Member

@rvagg I think this is still good to go, it just needs a rebase. I can file a rebased PR if you want.

saper added a commit to saper/node that referenced this pull request Dec 20, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
@saper
Copy link
Author

saper commented Dec 20, 2016

I have pushed the rebase to the branch, there were no conflicts.

bnoordhuis pushed a commit to bnoordhuis/io.js that referenced this pull request Dec 20, 2016
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
@bnoordhuis
Copy link
Member

This PR still seems to contain unrelated changes. I've opened #10355 as a cherry-pick of your commit on top of v0.12-staging.

@saper
Copy link
Author

saper commented Dec 20, 2016

thanks, @bnoordhuis ! I appreciate that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants