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

deps/v8: add missing #include "unicode/normlzr.h" #13040

Closed
wants to merge 1 commit into
base: v6.x-staging
from

Conversation

Projects
None yet
7 participants
@ArchangeGabriel

ArchangeGabriel commented May 15, 2017

  • The following function from <unicode/normlzr.h> is used:
    normalize()

  • Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022

P.S.: This is my first PR in Node, and my first “real” PR in any project, so I don’t expect it to be alright from the start.

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

hey @ArchangeGabriel thanks for submitting this PR

This patch most likely needs to be sent upstream to V8 first. We could then backport the V8 patch to each appropriate release stream. /cc @fhinkel who might be able to help with this (a patch on V8 and then a backport to Node!!!)

As a heads up, v4.x is in maintenance mode, it would not likely land for a while due to not being critical bug fix as v4 ships with icu: '56.1'. You can find out more about the LTS process here

Member

MylesBorins commented May 16, 2017

hey @ArchangeGabriel thanks for submitting this PR

This patch most likely needs to be sent upstream to V8 first. We could then backport the V8 patch to each appropriate release stream. /cc @fhinkel who might be able to help with this (a patch on V8 and then a backport to Node!!!)

As a heads up, v4.x is in maintenance mode, it would not likely land for a while due to not being critical bug fix as v4 ships with icu: '56.1'. You can find out more about the LTS process here

@MylesBorins

-1 needs to be fixed in V8

edit:

this is not meaningful upstream to V8 so it makes sense to land it as a patch onto v6.x and backport to v4.x

@bnoordhuis

This comment has been minimized.

Show comment
Hide comment
@bnoordhuis

bnoordhuis May 16, 2017

Member

@MylesBorins This patch is not relevant upstream, they are switching (or have switched) to ICU 59.

Member

bnoordhuis commented May 16, 2017

@MylesBorins This patch is not relevant upstream, they are switching (or have switched) to ICU 59.

@fhinkel

This comment has been minimized.

Show comment
Hide comment
@fhinkel

fhinkel May 16, 2017

Member

LGTM. Yes, upstream V8 wouldn't be right. Thanks @ArchangeGabriel !

Member

fhinkel commented May 16, 2017

LGTM. Yes, upstream V8 wouldn't be right. Thanks @ArchangeGabriel !

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

My apologies. I must have misunderstood something. Should this target master?

Member

MylesBorins commented May 16, 2017

My apologies. I must have misunderstood something. Should this target master?

@bnoordhuis

This comment has been minimized.

Show comment
Hide comment
@bnoordhuis

bnoordhuis May 16, 2017

Member

I don't think so, master bundles ICU 59. This is just for v4.x and v6.x since they bundle ICU 58.

Member

bnoordhuis commented May 16, 2017

I don't think so, master bundles ICU 59. This is just for v4.x and v6.x since they bundle ICU 58.

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

master is not affected. This file is quite different in master, and already supports ICU 59. See #11753 for master and the v8 patches/links.

ArchangeGabriel commented May 16, 2017

master is not affected. This file is quite different in master, and already supports ICU 59. See #11753 for master and the v8 patches/links.

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

@MylesBorins To be more clear maybe: upstream v8 is not 4.x or 6.x v8, you only do cherry-pick.

Upstream v8 doesn’t need patching, because the current version supports ICU 59 (since patches/links from my previous comment).

Upstream v8 patches cannot be backported, because node 4.x and 6.x v8 doesn’t need the same fixes as upstream v8 for ICU 59, since the code is quite different.

ArchangeGabriel commented May 16, 2017

@MylesBorins To be more clear maybe: upstream v8 is not 4.x or 6.x v8, you only do cherry-pick.

Upstream v8 doesn’t need patching, because the current version supports ICU 59 (since patches/links from my previous comment).

Upstream v8 patches cannot be backported, because node 4.x and 6.x v8 doesn’t need the same fixes as upstream v8 for ICU 59, since the code is quite different.

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member
Member

MylesBorins commented May 16, 2017

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

OK, I’ve targeted v4.x first because it’s the one I have to use, but the fix is the same for v6.x.

I suppose you should also wait for ARM and ppc-linux CI to finish before merging?

ArchangeGabriel commented May 16, 2017

OK, I’ve targeted v4.x first because it’s the one I have to use, but the fix is the same for v6.x.

I suppose you should also wait for ARM and ppc-linux CI to finish before merging?

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

@ArchangeGabriel we generally waterfall from newer releases to older ones. Further v4.x is in maintenance, so a release won't be happening for quite a while for non critical bugs. If you are ok with it I'll update the issue to target v6.x and run CI again

Member

MylesBorins commented May 16, 2017

@ArchangeGabriel we generally waterfall from newer releases to older ones. Further v4.x is in maintenance, so a release won't be happening for quite a while for non critical bugs. If you are ok with it I'll update the issue to target v6.x and run CI again

I was wrong

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

@nodejs/v8 how would we want to float a patch like this on V8 for v6.x? Should it bump patch number?

Member

MylesBorins commented May 16, 2017

@nodejs/v8 how would we want to float a patch like this on V8 for v6.x? Should it bump patch number?

@targos

This comment has been minimized.

Show comment
Hide comment
@targos

targos May 16, 2017

Member

Should it bump patch number?

Yes

Member

targos commented May 16, 2017

Should it bump patch number?

Yes

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

@MylesBorins Yeah, sure. I fixed it on my side anyway, so this is mostly for other users/to be able to remove the patch from my build system. v6.x needs to be fixed too, I just didn’t open the v6.x PR in case this one would have required fixes.

ArchangeGabriel commented May 16, 2017

@MylesBorins Yeah, sure. I fixed it on my side anyway, so this is mostly for other users/to be able to remove the patch from my build system. v6.x needs to be fixed too, I just didn’t open the v6.x PR in case this one would have required fixes.

@MylesBorins MylesBorins changed the base branch from v4.x-staging to v6.x-staging May 16, 2017

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

@ArchangeGabriel github was not able to smartly change target... I have a working branch (including V8 bump). Can you enable us to push to your branch so I can update?

Member

MylesBorins commented May 16, 2017

@ArchangeGabriel github was not able to smartly change target... I have a working branch (including V8 bump). Can you enable us to push to your branch so I can update?

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

You can find the option on the right side of the screen at the bottom
screen shot 2017-05-16 at 11 22 28 am

Specifically this

screen shot 2017-05-16 at 11 22 33 am

Member

MylesBorins commented May 16, 2017

You can find the option on the right side of the screen at the bottom
screen shot 2017-05-16 at 11 22 28 am

Specifically this

screen shot 2017-05-16 at 11 22 33 am

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

This is already on.

ArchangeGabriel commented May 16, 2017

This is already on.

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

odd...

Member

MylesBorins commented May 16, 2017

odd...

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

Ahhh... I don't think we can force push.

here is the patch

MylesBorins@f00fe08

can you checkout v6.x-staging, cherry-pick, and force push over this branch. Sorry this is so convoluted

Member

MylesBorins commented May 16, 2017

Ahhh... I don't think we can force push.

here is the patch

MylesBorins@f00fe08

can you checkout v6.x-staging, cherry-pick, and force push over this branch. Sorry this is so convoluted

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

I can redo my branch to be only the patch on v6.x, and then you could add your bump and any other change, if that’s easier for you.

ArchangeGabriel commented May 16, 2017

I can redo my branch to be only the patch on v6.x, and then you could add your bump and any other change, if that’s easier for you.

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

Our messages crossed. I’m doing that right now (but could take some time since I don’t think I can do that from GitHub web, so I’ll have to clone the repo locally first).

ArchangeGabriel commented May 16, 2017

Our messages crossed. I’m doing that right now (but could take some time since I don’t think I can do that from GitHub web, so I’ll have to clone the repo locally first).

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 16, 2017

Member

@ArchangeGabriel whatever is easier for you. We only need to bump the patch number in deps/v8/include/v8-version.h. It should be part of the commit where the change is made

Member

MylesBorins commented May 16, 2017

@ArchangeGabriel whatever is easier for you. We only need to bump the patch number in deps/v8/include/v8-version.h. It should be part of the commit where the change is made

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 16, 2017

Done, sorry for the delay.

ArchangeGabriel commented May 16, 2017

Done, sorry for the delay.

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022

@MylesBorins MylesBorins added v6.x and removed v4.x labels May 18, 2017

@MylesBorins

LGTM

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 18, 2017

Member

@nodejs/lts anyone else want to review this?

Member

MylesBorins commented May 18, 2017

@nodejs/lts anyone else want to review this?

@gibfahn

This comment has been minimized.

Show comment
Hide comment
@gibfahn

gibfahn May 18, 2017

Member

Maybe cc/ @srl295 ?

Member

gibfahn commented May 18, 2017

Maybe cc/ @srl295 ?

@MylesBorins MylesBorins self-assigned this May 18, 2017

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 26, 2017

Small ping. I’d like to get this fixed in Argon and Boron so that I could package them without an out-of-tree patch. :)

ArchangeGabriel commented May 26, 2017

Small ping. I’d like to get this fixed in Argon and Boron so that I could package them without an out-of-tree patch. :)

@bnoordhuis

This comment has been minimized.

Show comment
Hide comment
@bnoordhuis

bnoordhuis May 27, 2017

Member

@ArchangeGabriel It has a couple of LGTMs, I expect it will land in the next v6.x patch release.

Member

bnoordhuis commented May 27, 2017

@ArchangeGabriel It has a couple of LGTMs, I expect it will land in the next v6.x patch release.

MylesBorins added a commit that referenced this pull request May 30, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022
PR-URL: #13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins May 30, 2017

Member

Landed in d3ae2f0

I'll backport to v4.x-staging but can make no guarantees when, if at all, we will land it

Member

MylesBorins commented May 30, 2017

Landed in d3ae2f0

I'll backport to v4.x-staging but can make no guarantees when, if at all, we will land it

MylesBorins added a commit that referenced this pull request May 30, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022
PR-URL: #13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel May 30, 2017

Thanks! :) I’ll keep an eye on v4.x changes to see if that get merged, but I’ll just keep the patch in my tree else. ;)

ArchangeGabriel commented May 30, 2017

Thanks! :) I’ll keep an eye on v4.x changes to see if that get merged, but I’ll just keep the patch in my tree else. ;)

MylesBorins added a commit that referenced this pull request Jun 6, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022
PR-URL: #13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@MylesBorins MylesBorins referenced this pull request Jun 6, 2017

Merged

v6.11.0 proposal #13059

@ArchangeGabriel ArchangeGabriel referenced this pull request Jun 9, 2017

Closed

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

0 of 4 tasks complete

MylesBorins added a commit that referenced this pull request Jul 11, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022
PR-URL: #13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

andrew749 added a commit to michielbaird/node that referenced this pull request Jul 19, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: nodejs/node#13022
PR-URL: nodejs/node#13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@MylesBorins MylesBorins referenced this pull request Sep 20, 2017

Closed

v4.8.5 proposal #15507

MylesBorins added a commit that referenced this pull request Oct 25, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: #13022
PR-URL: #13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@MylesBorins MylesBorins referenced this pull request Oct 25, 2017

Merged

v4.8.6 proposal #16500

MylesBorins added a commit that referenced this pull request Nov 6, 2017

2017-11-07, Version 4.8.6 'Argon' (Maintenance)
Notable Changes:

* **crypto**:
  - update root certificates (Ben Noordhuis)
    #13279
  - update root certificates (Ben Noordhuis)
    #12402
* **deps**:
  - add support for more modern versions of INTL (Bruno Pagani)
    #13040
  - upgrade openssl sources to 1.0.2m (Shigeki Ohtsu)
    #16691
  - upgrade openssl sources to 1.0.2l (Daniel Bevenius)
    #13233

MylesBorins added a commit that referenced this pull request Nov 6, 2017

2017-11-07, Version 4.8.6 'Argon' (Maintenance)
Notable Changes:

* **crypto**:
  - update root certificates (Ben Noordhuis)
    #13279
  - update root certificates (Ben Noordhuis)
    #12402
* **deps**:
  - add support for more modern versions of INTL (Bruno Pagani)
    #13040
  - upgrade openssl sources to 1.0.2m (Shigeki Ohtsu)
    #16691
  - upgrade openssl sources to 1.0.2l (Daniel Bevenius)
    #13233

PR-URL: #16500

MylesBorins added a commit that referenced this pull request Nov 7, 2017

2017-11-07, Version 4.8.6 'Argon' (Maintenance)
Notable Changes:

* **crypto**:
  - update root certificates (Ben Noordhuis)
    #13279
  - update root certificates (Ben Noordhuis)
    #12402
* **deps**:
  - add support for more modern versions of INTL (Bruno Pagani)
    #13040
  - upgrade openssl sources to 1.0.2m (Shigeki Ohtsu)
    #16691
  - upgrade openssl sources to 1.0.2l (Daniel Bevenius)
    #13233

PR-URL: #16500

@abernix abernix referenced this pull request Nov 7, 2017

Merged

Release 1.5.4 #9320

@ArchangeGabriel

This comment has been minimized.

Show comment
Hide comment
@ArchangeGabriel

ArchangeGabriel Nov 14, 2017

@MylesBorins Thanks for having finally merged that patch in v4.x. :)

ArchangeGabriel commented Nov 14, 2017

@MylesBorins Thanks for having finally merged that patch in v4.x. :)

gibfahn added a commit to ibmruntimes/node that referenced this pull request Nov 24, 2017

deps/v8: add missing #include "unicode/normlzr.h"
* The following function from <unicode/normlzr.h> is used:
     normalize()

* Until ICU 59, <unicode/normlzr.h> is indirectly included, but this changed with the 59 release. Adding this header has been the right thing to do for many years, so it is backwards compatible and fix compilation with recent ICU.

Refs: nodejs/node#13022
PR-URL: nodejs/node#13040
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

msoechting added a commit to hpicgs/node that referenced this pull request Feb 7, 2018

2017-11-07, Version 4.8.6 'Argon' (Maintenance)
Notable Changes:

* **crypto**:
  - update root certificates (Ben Noordhuis)
    nodejs#13279
  - update root certificates (Ben Noordhuis)
    nodejs#12402
* **deps**:
  - add support for more modern versions of INTL (Bruno Pagani)
    nodejs#13040
  - upgrade openssl sources to 1.0.2m (Shigeki Ohtsu)
    nodejs#16691
  - upgrade openssl sources to 1.0.2l (Daniel Bevenius)
    nodejs#13233

PR-URL: nodejs#16500
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment