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>
26 lines
921 B
Diff
26 lines
921 B
Diff
From 5ed8bd0689649f985ff1b89a63f064c078adc6a6 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Pavlov <alexpux@gmail.com>
|
|
Date: Thu, 12 Apr 2018 10:18:48 +0200
|
|
Subject: [PATCH 11/23] detect architecture
|
|
|
|
---
|
|
configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 5a242a1a..9950626e 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -855,7 +855,7 @@ def configure_node(o):
|
|
o['variables']['node_install_npm'] = b(not options.without_npm)
|
|
o['default_configuration'] = 'Debug' if options.debug else 'Release'
|
|
|
|
- host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
|
|
+ host_arch = host_arch_win() if (os.name == 'nt' and not ('GCC' in sys.version)) else host_arch_cc()
|
|
target_arch = options.dest_cpu or host_arch
|
|
# ia32 is preferred by the build tools (GYP) over x86 even if we prefer the latter
|
|
# the Makefile resets this to x86 afterward
|
|
--
|
|
2.17.0.windows.1
|
|
|