dd04f56a2b
Remove <https://debbugs.gnu.org/23744> and <https://debbugs.gnu.org/23723> workaround. * gnu/packages/node.scm (node): Update to 6.8.0. (node)[arguments]: Disabled more tests. Remove custom 'patch-shebangs' phase. Manually patch npm script shebang in new 'patch-npm-shebang' phase. * gnu/packages/patches/node-9077.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patches. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
31 lines
1,015 B
Diff
31 lines
1,015 B
Diff
From fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4 Mon Sep 17 00:00:00 2001
|
|
From: "Bradley T. Hughes" <bradleythughes@fastmail.fm>
|
|
Date: Thu, 13 Oct 2016 07:38:38 +0000
|
|
Subject: [PATCH] build: add -DZLIB_CONST when building with --shared-zlib
|
|
|
|
Commit 782620f added the define only when building with the bundled
|
|
zlib. Using a shared zlib results in build breakage:
|
|
|
|
../src/inspector_agent.cc:179:16: error: assigning to 'Bytef *' (aka 'unsigned char *') from incompatible type
|
|
'const uint8_t *' (aka 'const unsigned char *')
|
|
strm.next_in = PROTOCOL_JSON + 3;
|
|
^ ~~~~~~~~~~~~~~~~~
|
|
1 error generated.
|
|
---
|
|
node.gyp | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/node.gyp b/node.gyp
|
|
index fa98547..d799ba1 100644
|
|
--- a/node.gyp
|
|
+++ b/node.gyp
|
|
@@ -480,6 +480,8 @@
|
|
}],
|
|
[ 'node_shared_zlib=="false"', {
|
|
'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
|
|
+ }, {
|
|
+ 'defines': [ 'ZLIB_CONST' ],
|
|
}],
|
|
|
|
[ 'node_shared_http_parser=="false"', {
|