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.

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

Jump to bottom

Import gyp patches from nodejs/node #1518

Closed
wants to merge 8 commits into from
Closed

Import gyp patches from nodejs/node #1518

wants to merge 8 commits into from

Commits on Jul 31, 2018

  1. gyp: backport GYP fix to fix AIX shared suffix 

    Required to support the shared library builds on AIX - this sets the
shared library suffix within GYP to .a instead of .so on AIX
My patch: https://codereview.chromium.org/2492233002/ was landed as
as part of this one which fixed some other (not required, but
included for completeness of the backport) changes:

PR-URL: https://github.com/nodejs/node/pull9675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Ref: https://codereview.chromium.org/2511733005/
    @maclover7
    Stewart Addison authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    195e379 View commit details
    Browse the repository at this point in the history

  2. gyp: float gyp patch for long filenames 

    Pulling in https://codereview.chromium.org/2019133002/ in its current
state, as gyp seems to be largely abandoned as a project.

Original commit message:

    Hash intermediate file name to avoid ENAMETOOLONG

    Hash the intermediate Makefile target used for multi-output rules
    so that it still works when the involved file names are very long.

    Since the intermediate file's name is effectively arbitrary, this
    does not come with notable behavioural changes.

    The `import hashlib` boilerplate is taken directly
    from `xcodeproj_file.py`.

Concretely, this makes the V8 inspector build currently fail when long
pathnames are involved, notably when using ecryptfs which has a lower
file name length limit.

Fixes: nodejs/node#7959
Ref: nodejs/node#7510
PR-URL: nodejs/node#7963
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
    @addaleax @maclover7
    addaleax authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    bd6929e View commit details
    Browse the repository at this point in the history

  3. gyp: add compile_commands.json gyp generator 

    this is a re-base of the gyp part of
3c46bb9931ecea71167342322e09121ee48cde8e
after bumping GYP version to
https://chromium.googlesource.com/external/gyp/+/eb296f67da078ec01f5e3a9ea9cdc6d26d680161

Original-Review-By: James M Snell <jasnell@gmail.com>
Ref: nodejs/node#7986
PR-URL: nodejs/node#12450
Reviewed-By: João Reis <reis@janeasystems.com>
    @bnoordhuis @maclover7
    bnoordhuis authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2dcb7a5 View commit details
    Browse the repository at this point in the history

  4. gyp: enable cctest to use objects (gyp part) 

    this is a re-base of the gyp part of
6a09a69ec9d36b705e9bde2ac1a193566a702d96
after bumping GYP version to
https://chromium.googlesource.com/external/gyp/+/eb296f67da078ec01f5e3a9ea9cdc6d26d680161

Original-PR-URL: nodejs/node#11956
Original-Ref: nodejs/node#9163
Original-Reviewed-By: James M Snell <jasnell@gmail.com>

PR-URL: nodejs/node#12450
Reviewed-By: João Reis <reis@janeasystems.com>
    @danbev @maclover7
    danbev authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    0bf105d View commit details
    Browse the repository at this point in the history

  5. gyp: implement LD/LDXX for ninja and FIPS 

    The ability to set the link rule is used for FIPS, and needs to set
both the `ld =` and `ldxx =` variables in the ninja build file to link
c++ (node) and c (openssl-cli, etc.) executables.

URL: nodejs/node#14227
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
    @sam-github @maclover7
    sam-github authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    a53dd31 View commit details
    Browse the repository at this point in the history

  6. tools: fix "the the" typos in comments 

    PR-URL: nodejs/node#20716
Fixes: nodejs/node#20682
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
    @maclover7
    Masashi Hirano authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    628acf6 View commit details
    Browse the repository at this point in the history

  7. tools: patch gyp to avoid xcrun errors 

    Previously running ./configure with only the Xcode Command Line Tools
installed would give:

xcrun: error: unable to lookup item 'PlatformPath' from command line tools installation
xcrun: error: unable to lookup item 'PlatformPath' in SDK '/'

Co-authored-by: Ben Noordhuis <info@bnoordhuis.nl>
Fixes: nodejs/node#12531

PR-URL: nodejs/node#21520
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
    @ryzokuken @maclover7
    ryzokuken authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    b2c4f7b View commit details
    Browse the repository at this point in the history

  8. gyp: fix ninja build failure (GYP patch) 

    Currently the files specified in libraries in node.gyp `cctest` target are
getting a '.lib' extension on windows when generated with ninja.
This commit adds a check to see if a file has a '.obj' extension and in
that case no '.lib' extension will be added.

Also, the LIBS specified in the 'libraries' section are not
being included in the --start-group --end-group section which
means that these libraries will not be searched causing issue
with linkers where the order matters.

PR-URL: nodejs/node#12484
Fixes: nodejs/node#12448
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
    @danbev @maclover7
    danbev authored and maclover7 committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    a2425a3 View commit details
    Browse the repository at this point in the history