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>
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
From d17f9f527f2cdae7564602525b7e851ce4902115 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Sat, 14 Apr 2018 20:10:12 +0200
|
|
Subject: [PATCH 16/23] format-macros.h: do not rely on __STDC_FORMAT_MACROS
|
|
|
|
The PRId64 macro and friends are not universally defined in inttypes.h.
|
|
Let's just go ahead and define them when needed.
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
---
|
|
deps/v8/src/base/format-macros.h | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/deps/v8/src/base/format-macros.h b/deps/v8/src/base/format-macros.h
|
|
index 5f5fe5df..13f240a2 100644
|
|
--- a/deps/v8/src/base/format-macros.h
|
|
+++ b/deps/v8/src/base/format-macros.h
|
|
@@ -80,6 +80,16 @@
|
|
|
|
#else // V8_OS_WIN
|
|
|
|
+#ifndef PRId64
|
|
+#define PRId64 "I64d"
|
|
+#endif
|
|
+#ifndef PRIu64
|
|
+#define PRIu64 "I64u"
|
|
+#endif
|
|
+#ifndef PRIx64
|
|
+#define PRIx64 "I64x"
|
|
+#endif
|
|
+
|
|
#if !defined(PRId64) || !defined(PRIu64) || !defined(PRIx64)
|
|
#error "inttypes.h provided by win toolchain should define these."
|
|
#endif
|
|
--
|
|
2.17.0.windows.1
|
|
|