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

tools: update gyp to b3cef02 #3487

Closed
wants to merge 2 commits into from
Closed

tools: update gyp to b3cef02 #3487

wants to merge 2 commits into from

Conversation

imran-iq
Copy link
Contributor

Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

CI run here https://ci.nodejs.org/job/node-test-commit/882/
Intermittent failure that passed on rerun:
https://ci.nodejs.org/job/node-test-commit-arm/958/

@Fishrock123 Fishrock123 added the tools Issues and PRs related to the tools directory. label Oct 22, 2015
@mhdawson
Copy link
Member

@bnoordhuis can you take a look at this one

@bnoordhuis
Copy link
Member

LGTM but can you list the significant changes in the commit log?

@shigeki
Copy link
Contributor

shigeki commented Oct 24, 2015

I'm surprised at CI on MacOSX working fine. Is the floating patch of 58e914f no longer needed?

@imran-iq
Copy link
Contributor Author

That is still needed. I left the code in there.

@shigeki
Copy link
Contributor

shigeki commented Oct 27, 2015

@iwuzhere Could you make an another commit for changing xcode_emulation.py from the original one? We would lost to find what floating patch was applied with git log.

@mhdawson
Copy link
Member

@iwuzhere If I understand correctly what we need is a PR with 2 commits. One which brings us to be in sync with the gyp repo and then a second which applies the floating patch so that its clear that its a change from the base.

@imran-iq
Copy link
Contributor Author

@shigeki Added the commit for xcode_emulation.py

Imran Iqbal added 2 commits October 28, 2015 14:26
Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

CI run here https://ci.nodejs.org/job/node-test-commit/882/
Intermittent failure that passed on rerun:
https://ci.nodejs.org/job/node-test-commit-arm/958/
re-applying floating patch on top of gyp update[1]

[1]58e914f
@mhdawson
Copy link
Member

@shigeki @bnoordhuis good to go now ?

@shigeki
Copy link
Contributor

shigeki commented Oct 30, 2015

LGTM

@bnoordhuis
Copy link
Member

bnoordhuis pushed a commit that referenced this pull request Oct 30, 2015
Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

PR-URL: #3487
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
@bnoordhuis
Copy link
Member

CI looks good. Landed in cf0130d...be65f5f. I replaced the xcode fix with the original commit, its commit log has a bit more detail.

@bnoordhuis bnoordhuis closed this Oct 30, 2015
rvagg pushed a commit that referenced this pull request Nov 7, 2015
Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

PR-URL: #3487
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
@Fishrock123 Fishrock123 mentioned this pull request Nov 11, 2015
@rvagg rvagg mentioned this pull request Dec 17, 2015
@mhdawson
Copy link
Member

In terms of a backport to 4.X it would be nice as it means less merge work for us during the rest of 4.X's lifespan.

MylesBorins pushed a commit that referenced this pull request Mar 21, 2016
Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

PR-URL: #3487
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
MylesBorins pushed a commit that referenced this pull request Mar 21, 2016
Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

PR-URL: #3487
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants