diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-03 18:18:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-03 18:18:28 +0000 |
commit | fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (patch) | |
tree | 6be36785f6ffa594c4dbd785b3213c995b5195b9 /net-libs/nodejs/files | |
parent | 27dfd272ae3be15b1017f733682211afa1c7c0f0 (diff) |
gentoo resync : 03.11.2017
Diffstat (limited to 'net-libs/nodejs/files')
-rw-r--r-- | net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch deleted file mode 100644 index 5f5a2c7b7ff0..000000000000 --- a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/configure -+++ b/configure -@@ -182,6 +182,27 @@ - dest='shared_http_parser_libpath', - help='a directory to search for the shared http_parser DLL') - -+shared_optgroup.add_option('--shared-nghttp2', -+ action='store_true', -+ dest='shared_nghttp2', -+ help='link to a shared nghttp2 DLL instead of static linking') -+ -+shared_optgroup.add_option('--shared-nghttp2-includes', -+ action='store', -+ dest='shared_nghttp2_includes', -+ help='directory containing nghttp2 header files') -+ -+shared_optgroup.add_option('--shared-nghttp2-libname', -+ action='store', -+ dest='shared_nghttp2_libname', -+ default='nghttp2', -+ help='alternative lib name to link to [default: %default]') -+ -+shared_optgroup.add_option('--shared-nghttp2-libpath', -+ action='store', -+ dest='shared_nghttp2_libpath', -+ help='a directory to search for the shared nghttp2 DLL') -+ - shared_optgroup.add_option('--shared-libuv', - action='store_true', - dest='shared_libuv', -@@ -1360,6 +1381,7 @@ - configure_node(output) - configure_library('zlib', output) - configure_library('http_parser', output) -+configure_library('nghttp2', output) - configure_library('libuv', output) - configure_library('libcares', output) - # stay backwards compatible with shared cares builds ---- a/node.gyp -+++ b/node.gyp -@@ -14,6 +14,7 @@ - 'node_module_version%': '', - 'node_shared_zlib%': 'false', - 'node_shared_http_parser%': 'false', -+ 'node_shared_nghttp2%': 'false', - 'node_shared_cares%': 'false', - 'node_shared_libuv%': 'false', - 'node_use_openssl%': 'true', -@@ -151,8 +152,15 @@ - 'type': '<(node_target_type)', - - 'dependencies': [ -- 'node_js2c#host', -- 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ 'node_js2c#host' -+ ], -+ -+ 'conditions': [ -+ [ 'node_shared_nghttp2=="false"', { -+ 'dependencies': [ -+ 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ ] -+ }] - ], - - 'includes': [ -@@ -163,8 +171,7 @@ - 'src', - 'tools/msvs/genfiles', - 'deps/uv/src/ares', -- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h -- 'deps/nghttp2/lib/includes' -+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h - ], - - 'sources': [ -@@ -691,6 +696,15 @@ - 'deps/http_parser/http_parser.gyp:http_parser' - ] - }], -+ [ 'node_shared_nghttp2=="false"', { -+ 'dependencies': [ -+ 'deps/nghttp2/nghttp2.gyp:nghttp2' -+ ], -+ 'defines': [ -+ # We're using the nghttp2 static lib -+ 'NGHTTP2_STATICLIB' -+ ] -+ }], - [ 'node_shared_libuv=="false"', { - 'dependencies': [ - 'deps/uv/uv.gyp:libuv' ---- a/node.gypi -+++ b/node.gypi -@@ -251,6 +251,10 @@ - 'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ], - }], - -+ [ 'node_shared_nghttp2=="false"', { -+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], -+ }], -+ - [ 'node_shared_cares=="false"', { - 'dependencies': [ 'deps/cares/cares.gyp:cares' ], - }], |