87a0b47b97
* nodejs: re-generate patchset Git's `format-patch` now uses a narrower diffstat, longer abbreviated hashes in the index lines, and a different Git version, of course. Besides, the patches started out as an 11-strong patch series (and is now 13-strong, which is reflected in the [PATCH k/13] prefix of the Subject: lines), and the 12th patch even lacked attribution and a commit message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: adjust patches for v6.14.1 The code base changed enough that some patches are obsolete, and others need to be applied to a different file, yet others simply do not apply cleanly. Note: this does not yet allow building v6.14.1, but *only* adjusts the existing patches as required, for ease of reviewing. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: do not link to the shared (stale) libuv Node.js v6.14.1 relies on libuv to be up to date. In particular, it requires the uv_os_getppid() function to be available. The version of libuv shipped in MSYS2 is too old and does not provide that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: update to v6.14.1 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: prepare for packaging v6.14.1 Long path problems... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: adjust patches for v8.11.1 Sadly, v6.14.1 would not be able to package because of too-long paths inside npm's nested node_modules/ directories. Let's hope that v8.11.1 works better. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * nodejs: prepare for v8.11.1 It needs quite a bit more patching. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * mingw-w64-nodejs: upgrade to v8.11.1 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
66 lines
1.8 KiB
Diff
66 lines
1.8 KiB
Diff
From 5f390ae5e8857ad8c4d0a8b00818eadd8d8f4daa Mon Sep 17 00:00:00 2001
|
|
From: Alethea Rose <alethea@alethearose.com>
|
|
Date: Tue, 14 Feb 2017 23:11:03 -0500
|
|
Subject: [PATCH 05/23] Remove .lib suffix on linked libraries
|
|
|
|
---
|
|
deps/v8/BUILD.gn | 8 ++++----
|
|
deps/v8/src/v8.gyp | 8 ++++----
|
|
node.gyp | 2 +-
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn
|
|
index 9d95036a..9a8c48db 100644
|
|
--- a/deps/v8/BUILD.gn
|
|
+++ b/deps/v8/BUILD.gn
|
|
@@ -2537,10 +2537,10 @@ v8_component("v8_libbase") {
|
|
defines += [ "_CRT_RAND_S" ] # for rand_s()
|
|
|
|
libs = [
|
|
- "dbghelp.lib",
|
|
- "shlwapi.lib",
|
|
- "winmm.lib",
|
|
- "ws2_32.lib",
|
|
+ "dbghelp",
|
|
+ "shlwapi",
|
|
+ "winmm",
|
|
+ "ws2_32",
|
|
]
|
|
}
|
|
|
|
diff --git a/deps/v8/src/v8.gyp b/deps/v8/src/v8.gyp
|
|
index 05204ef2..1baa7ab3 100644
|
|
--- a/deps/v8/src/v8.gyp
|
|
+++ b/deps/v8/src/v8.gyp
|
|
@@ -2139,10 +2139,10 @@
|
|
'msvs_disabled_warnings': [4351, 4355, 4800],
|
|
'link_settings': {
|
|
'libraries': [
|
|
- '-ldbghelp.lib',
|
|
- '-lshlwapi.lib',
|
|
- '-lwinmm.lib',
|
|
- '-lws2_32.lib'
|
|
+ '-ldbghelp',
|
|
+ '-lshlwapi',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32'
|
|
],
|
|
},
|
|
}],
|
|
diff --git a/node.gyp b/node.gyp
|
|
index 38dcdac0..dba17e28 100644
|
|
--- a/node.gyp
|
|
+++ b/node.gyp
|
|
@@ -348,7 +348,7 @@
|
|
'NODE_PLATFORM="win32"',
|
|
'_UNICODE=1',
|
|
],
|
|
- 'libraries': [ '-lpsapi.lib' ]
|
|
+ 'libraries': [ '-lpsapi' ]
|
|
}, { # POSIX
|
|
'defines': [ '__POSIX__' ],
|
|
'sources': [ 'src/backtrace_posix.cc' ],
|
|
--
|
|
2.17.0.windows.1
|
|
|