diff options
Diffstat (limited to 'data/nodejs/gyp.diff')
| -rw-r--r-- | data/nodejs/gyp.diff | 60 |
1 files changed, 14 insertions, 46 deletions
diff --git a/data/nodejs/gyp.diff b/data/nodejs/gyp.diff index bf41b1113..f3fb126f1 100644 --- a/data/nodejs/gyp.diff +++ b/data/nodejs/gyp.diff @@ -1,7 +1,7 @@ -diff -ur node-v12.2.0/tools/gyp/pylib/gyp/generator/make.py node-v12.2.0+iPhone/tools/gyp/pylib/gyp/generator/make.py ---- node-v12.2.0/tools/gyp/pylib/gyp/generator/make.py 2019-05-07 14:52:16.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/gyp/pylib/gyp/generator/make.py 2019-05-23 02:23:10.400738717 +0000 -@@ -173,8 +173,25 @@ +diff -Naur node-v12.17.0/tools/gyp/pylib/gyp/generator/make.py node-v12.17.0+iPhone/tools/gyp/pylib/gyp/generator/make.py +--- node-v12.17.0/tools/gyp/pylib/gyp/generator/make.py 2020-05-26 04:53:35.000000000 -0700 ++++ node-v12.17.0+iPhone/tools/gyp/pylib/gyp/generator/make.py 2020-05-27 20:02:34.000000000 -0700 +@@ -175,8 +175,25 @@ """ LINK_COMMANDS_MAC = """\ @@ -29,48 +29,16 @@ diff -ur node-v12.2.0/tools/gyp/pylib/gyp/generator/make.py node-v12.2.0+iPhone/ quiet_cmd_link = LINK($(TOOLSET)) $@ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) -@@ -2033,41 +2049,9 @@ - 'srcdir': srcdir, - 'copy_archive_args': copy_archive_arguments, +@@ -2066,7 +2083,11 @@ + 'CXX.host': GetEnvironFallback(('CXX_host', 'CXX'), 'g++'), + 'LINK.host': GetEnvironFallback(('LINK_host', 'LINK'), '$(CXX.host)'), } - if flavor == 'mac': -- flock_command = './gyp-mac-tool flock' -- header_params.update({ -- 'flock': flock_command, -- 'flock_index': 2, -- 'link_commands': LINK_COMMANDS_MAC, -- 'extra_commands': SHARED_HEADER_MAC_COMMANDS, -- }) -- elif flavor == 'android': -- header_params.update({ -- 'link_commands': LINK_COMMANDS_ANDROID, -- }) -- elif flavor == 'solaris': -- header_params.update({ -- 'flock': './gyp-flock-tool flock', -- 'flock_index': 2, -- }) -- elif flavor == 'freebsd': -- # Note: OpenBSD has sysutils/flock. lockf seems to be FreeBSD specific. -- header_params.update({ -- 'flock': 'lockf', -- }) -- elif flavor == 'openbsd': -- copy_archive_arguments = '-pPRf' -- header_params.update({ -- 'copy_archive_args': copy_archive_arguments, -- }) -- elif flavor == 'aix': -- copy_archive_arguments = '-pPRf' -- header_params.update({ -- 'copy_archive_args': copy_archive_arguments, -- 'link_commands': LINK_COMMANDS_AIX, -- 'flock': './gyp-flock-tool flock', -- 'flock_index': 2, -- }) -+ header_params.update({ -+ 'link_commands': LINK_COMMANDS_IOS, ++ if flavor == 'ios' or True: ++ header_params.update({ ++ 'link_commands': LINK_COMMANDS_IOS, + }) - - header_params.update({ - 'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'), ++ elif flavor == 'mac': + flock_command = './gyp-mac-tool flock' + header_params.update({ + 'flock': flock_command, |