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

(v6.x backport) v8: fix build errors with g++ 7 #13574

Closed
wants to merge 1 commit into from
Closed

(v6.x backport) v8: fix build errors with g++ 7 #13574

wants to merge 1 commit into from

Conversation

kasicka
Copy link

@kasicka kasicka commented Jun 9, 2017

This is patch from fedora rawhide to fix gcc 7 build errors, same as 2a2a556

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

@nodejs-github-bot nodejs-github-bot added v6.x v8 engine Issues and PRs related to the V8 dependency. labels Jun 9, 2017
@ArchangeGabriel
Copy link

Patch seems to work :), but I have no knowledge to say whether this is the correct fix.

However @kasicka to get that patch merged you’ll have to work on the commit guidelines I think. “Fix gcc7 build errors” is not a good commit message (you should rather say what you changed and then explain this was causing issue with GCC 7; and also prefix the commit message with deps/v8: so that we know where the change when), and also you will have to bump the patch level of v8. For both things, you can take a look at my PR that would have been called “Fix icu 59 build errors”.

@kasicka kasicka changed the title Fix gcc 7 build errors v8: Fix gcc 7 build errors Jun 9, 2017
@gibfahn
Copy link
Member

gibfahn commented Jun 9, 2017

Is this a backport of #12392? A backport was requested in #12392 (comment), so assuming this is the same fix it should land as a backport.

The backporting guide is here, basically you just cherry-pick 2bbee49 to v6.x-staging (which I think you've already done, but you should keep the commit message exactly as it was). So at this point you can just change the commit message to:

v8: fix build errors with g++ 7

This is a local patch because upstream fixed it differently by moving
large chunks of code out of objects.h.  We cannot easily back-port
those changes due to their size and invasiveness.

Fixes: https://github.com/nodejs/node/issues/10388
PR-URL: https://github.com/nodejs/node/pull/12392
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: James M Snell <[email protected]>

and it should all be good.

@gibfahn gibfahn changed the title v8: Fix gcc 7 build errors (v6.x backport) v8: fix build errors with g++ 7 Jun 9, 2017
@ArchangeGabriel
Copy link

@gibfahn Now that you’ve said it, yes, this definitively is a backport, but it’s not a cherry-pick of 2bbee49 since as @MylesBorins said in #12392 (comment), this wasn’t landing cleanly: indeed, while the two first files are almost identic, the third one was apparently a bit different (https://github.com/nodejs/node/pull/13574/files#diff-e6fb745db6e94b37a831f44722419e06 vs https://github.com/nodejs/node/pull/12392/files#diff-e6fb745db6e94b37a831f44722419e06).

@gibfahn
Copy link
Member

gibfahn commented Jun 9, 2017

I think a cherry-pick where you had to do some extra stuff still counts as a backport, fundamentally you're making the same change for the same reasons, it's just not identical because the original code looks different.

@ArchangeGabriel
Copy link

I think you wanted to say still counts as a “cherry-pick”. And I mostly agree with you, it’s just not exactly a git cherry-pick. ;)

@MylesBorins
Copy link
Contributor

MylesBorins commented Jun 9, 2017

@ArchangeGabriel while I appreciate you coming in here to help out, that being said nitpicking about language around "cherry-picking" is not exactly helpful, especially as you are trying to correct someone who has helped draft our policy.

edit: I want to reaffirm that I genuinely appreciate trying to engage and help us with the review process. Just wanted to point out specific behavior I didn't find productive

@gibfahn
Copy link
Member

gibfahn commented Jun 9, 2017

I think you wanted to say still counts as a “cherry-pick”.

FWIW I did mean backport. You're right, it's not a cherry-pick. In Node core if it cherry-picks cleanly we just cherry-pick it directly, it's only if changes have to be made that we ask someone to raise a backport. So git cherry-pick + changes == a backport PR.

@mscdex mscdex added the build Issues and PRs related to build files or the CI. label Jun 9, 2017
@ArchangeGabriel
Copy link

@MylesBorins @gibfahn Sorry to both of you, I didn’t understood you were talking of the meaning of cherry-pick and backport w.r.t. your policy (while I was referring their general meaning in VCS-based dev). But @MylesBorins is right, this was mostly useless noise from my part here.

Now what matters is that this is indeed a backport of #12392, and thus @kasicka should update the commit message as asked for this to get merged.

@kasicka
Copy link
Author

kasicka commented Jun 11, 2017

The commit message was changed already on Friday.

@ArchangeGabriel
Copy link

@kasicka Hum, maybe you forgot to push it then?

@gibfahn
Copy link
Member

gibfahn commented Jun 11, 2017

@kasicka The PR title was updated, but the commit message wasn't updated, see here:

image

If you could change the commit message to this and push to your branch that'd be great, otherwise someone can fix it on landing.

This is a local patch because upstream fixed it differently by moving
large chunks of code out of objects.h.  We cannot easily back-port
those changes due to their size and invasiveness.

Fixes: #10388
PR-URL: #12392
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@kasicka
Copy link
Author

kasicka commented Jun 12, 2017

Pushing to wrong branch, my bad.

@gibfahn
Copy link
Member

gibfahn commented Jun 12, 2017

cc/ @nodejs/v8 (to make sure this is okay)

Assuming it's fine we can just land this on v6.x-staging, @nodejs/lts LMK if there's an issue with doing that.

@bnoordhuis
Copy link
Member

nitpicking about language around "cherry-picking" is not exactly helpful

It's not nitpicking. I'm meticulous in distinguishing between back-ports and cherry-picks and so should you (and everyone else.)

@kasicka
Copy link
Author

kasicka commented Jun 15, 2017

Can this get merged?

@gibfahn
Copy link
Member

gibfahn commented Jun 15, 2017

Can this get merged?

Yep, it'll get landed as part of the work to prepare the next 6.x release (which should happen over the next day or two).

It's not waiting for anything from you.

gibfahn pushed a commit to gibfahn/node that referenced this pull request Jun 17, 2017
This is a local patch because upstream fixed it differently by moving
large chunks of code out of objects.h.  We cannot easily back-port
those changes due to their size and invasiveness.

Fixes: nodejs#10388
PR-URL: nodejs#12392
Backport-PR-URL: nodejs#13574
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@gibfahn
Copy link
Member

gibfahn commented Jun 17, 2017

@gibfahn
Copy link
Member

gibfahn commented Jun 17, 2017

Landed in 11c7e01

@gibfahn gibfahn closed this Jun 17, 2017
@gibfahn gibfahn mentioned this pull request Jun 18, 2017
4 tasks
gibfahn pushed a commit that referenced this pull request Jun 20, 2017
This is a local patch because upstream fixed it differently by moving
large chunks of code out of objects.h.  We cannot easily back-port
those changes due to their size and invasiveness.

Fixes: #10388
PR-URL: #12392
Backport-PR-URL: #13574
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@pabigot
Copy link
Contributor

pabigot commented Jul 9, 2017

@gibfahn Sorry for my confusion, but where did this land? I was hoping to get a format-patch version to fix this in Yocto's meta-nodejs. The referenced commit 11c7e01 isn't in v6.x-staging or v6.x AFAICT, and though I can see the commit through the link in the "landed" comment neither fetching into my clone nor a fresh clone produce it. Maybe it's under some non-head ref?

pabigot added a commit to pabigot/meta-nodejs that referenced this pull request Jul 9, 2017
pabigot added a commit to pabigot/meta-nodejs that referenced this pull request Jul 9, 2017
@gibfahn
Copy link
Member

gibfahn commented Jul 9, 2017

@pabigot it landed in 11c7e0164a (the staging branch had to be rebased, and this hasn't yet gone into a release.

@pabigot
Copy link
Contributor

pabigot commented Jul 9, 2017

@gibfahn Thanks; I hadn't accounted for a rebase.

MylesBorins pushed a commit that referenced this pull request Jul 11, 2017
This is a local patch because upstream fixed it differently by moving
large chunks of code out of objects.h.  We cannot easily back-port
those changes due to their size and invasiveness.

Fixes: #10388
PR-URL: #12392
Backport-PR-URL: #13574
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: James M Snell <[email protected]>
farshadmgc added a commit to farshadmgc/meta-nodejs that referenced this pull request Dec 13, 2017
nyh added a commit to cloudius-systems/osv-apps that referenced this pull request Jan 28, 2018
There is a known bug compiling node 6.* on gcc 7:
nodejs/node#13574
This patch picks up a patch for upstream for fixing the compilation.

Signed-off-by: Nadav Har'El <[email protected]>
zoltan-ongithub pushed a commit to zoltan-ongithub/pxCore that referenced this pull request Apr 12, 2019
Backport GCC 7 compatibility fixes from upstream:

nodejs/node#13574
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. v8 engine Issues and PRs related to the V8 dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants