diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
| commit | d1a914082b7e53636f9801769ef96218b2125c4b (patch) | |
| tree | 998805fc59fe0b1bb105b24a6a79fff646257d96 /gnu/packages/patches/node-9077.patch | |
| parent | 657fb6c947d94cf946f29cd24e88bd080c01ff0a (diff) | |
| parent | ae548434337cddf9677a4cd52b9370810b2cc9b6 (diff) | |
| download | guix-d1a914082b7e53636f9801769ef96218b2125c4b.tar guix-d1a914082b7e53636f9801769ef96218b2125c4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/node-9077.patch')
| -rw-r--r-- | gnu/packages/patches/node-9077.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gnu/packages/patches/node-9077.patch b/gnu/packages/patches/node-9077.patch index e57f5caac7..6b71d48c0e 100644 --- a/gnu/packages/patches/node-9077.patch +++ b/gnu/packages/patches/node-9077.patch @@ -12,19 +12,20 @@ zlib. Using a shared zlib results in build breakage: ^ ~~~~~~~~~~~~~~~~~ 1 error generated. --- - node.gyp | 2 ++ - 1 file changed, 2 insertions(+) + node.gyp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/node.gyp b/node.gyp -index fa98547..d799ba1 100644 +index 272dc98..667c260 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"', { +@@ -653,7 +653,8 @@ + [ 'node_shared_zlib=="false"', { + 'dependencies': [ + 'deps/zlib/zlib.gyp:zlib', +- ] ++ ]}, { ++ 'defines': [ 'ZLIB_CONST' ], + }], + [ 'node_shared_openssl=="false"', { + 'dependencies': [ |