gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-25 21:08:35 -07:00
Code Issues Projects Releases Wiki Activity

net-libs/nodejs: Use upstream patches for shared nghttp2 support.

Browse Source 
Package-Manager: Portage-2.3.14, Repoman-2.3.6
This commit is contained in:
Jeroen Roovers
2017-11-21 13:00:09 +01:00
parent 773e85d8da
commit d904f25f8d
2 changed files with 88 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
View File

@@ -1,8 +1,10 @@
diff --git a/configure b/configure
index 5703a70cb2d..3b6fc7347db 100755
--- a/configure
+++ b/configure
@@ -182,6 +182,27 @@
dest='shared_http_parser_libpath',
help='a directory to search for the shared http_parser DLL')
@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
dest='shared_libuv_libpath',
help='a directory to search for the shared libuv DLL')
+shared_optgroup.add_option('--shared-nghttp2',
+ action='store_true',
@@ -23,48 +25,40 @@
+shared_optgroup.add_option('--shared-nghttp2-libpath',
+ action='store',
+ dest='shared_nghttp2_libpath',
+ help='a directory to search for the shared nghttp2 DLL')
+ help='a directory to search for the shared nghttp2 DLLs')
+
shared_optgroup.add_option('--shared-libuv',
shared_optgroup.add_option('--shared-openssl',
action='store_true',
dest='shared_libuv',
@@ -1360,6 +1381,7 @@
configure_node(output)
configure_library('zlib', output)
dest='shared_openssl',
@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
configure_library('http_parser', output)
+configure_library('nghttp2', output)
configure_library('libuv', output)
configure_library('libcares', output)
+configure_library('nghttp2', output)
# stay backwards compatible with shared cares builds
output['variables']['node_shared_cares'] = \
output['variables'].pop('node_shared_libcares')
diff --git a/node.gyp b/node.gyp
index 86a4331a4ed..38241302e26 100644
--- a/node.gyp
+++ b/node.gyp
@@ -14,6 +14,7 @@
'node_module_version%': '',
'node_shared_zlib%': 'false',
@@ -16,6 +16,7 @@
'node_shared_http_parser%': 'false',
+ 'node_shared_nghttp2%': 'false',
'node_shared_cares%': 'false',
'node_shared_libuv%': 'false',
+ 'node_shared_nghttp2%': 'false',
'node_use_openssl%': 'true',
@@ -151,8 +152,15 @@
'type': '<(node_target_type)',
'node_shared_openssl%': 'false',
'node_v8_options%': '',
@@ -177,7 +178,6 @@
'dependencies': [
- 'node_js2c#host',
'node_js2c#host',
- 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ 'node_js2c#host'
+ ],
+
+ 'conditions': [
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [
+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ ]
+ }]
],
'includes': [
@@ -180,8 +180,7 @@
@@ -187,8 +187,7 @@
'include_dirs': [
'src',
'tools/msvs/genfiles',
@@ -74,32 +68,33 @@
],
'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'
@@ -930,6 +929,14 @@
'deps/uv/uv.gyp:libuv'
]
}],
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [
+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ ],
+ 'include_dirs': [
+ 'deps/nghttp2/lib/includes'
+ ]
+ }],
[ 'node_use_v8_platform=="true"', {
'dependencies': [
'deps/v8/src/v8.gyp:v8_libplatform',
diff --git a/node.gypi b/node.gypi
index ec78df2a339..3990c59ef98 100644
--- a/node.gypi
+++ b/node.gypi
@@ -251,6 +251,10 @@
'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
@@ -259,6 +259,10 @@
[ 'node_shared_libuv=="false"', {
'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
}],
+
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
+ }],
+
[ 'node_shared_cares=="false"', {
'dependencies': [ 'deps/cares/cares.gyp:cares' ],
}],
[ 'OS=="win"', {
'sources': [

75
net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
View File

@@ -1,8 +1,10 @@
diff --git a/configure b/configure
index 5703a70cb2d..3b6fc7347db 100755
--- a/configure
+++ b/configure
@@ -182,6 +182,27 @@
dest='shared_http_parser_libpath',
help='a directory to search for the shared http_parser DLL')
@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
dest='shared_libuv_libpath',
help='a directory to search for the shared libuv DLL')
+shared_optgroup.add_option('--shared-nghttp2',
+ action='store_true',
@@ -23,48 +25,40 @@
+shared_optgroup.add_option('--shared-nghttp2-libpath',
+ action='store',
+ dest='shared_nghttp2_libpath',
+ help='a directory to search for the shared nghttp2 DLL')
+ help='a directory to search for the shared nghttp2 DLLs')
+
shared_optgroup.add_option('--shared-libuv',
shared_optgroup.add_option('--shared-openssl',
action='store_true',
dest='shared_libuv',
@@ -1360,6 +1381,7 @@
configure_node(output)
configure_library('zlib', output)
dest='shared_openssl',
@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
configure_library('http_parser', output)
+configure_library('nghttp2', output)
configure_library('libuv', output)
configure_library('libcares', output)
+configure_library('nghttp2', output)
# stay backwards compatible with shared cares builds
output['variables']['node_shared_cares'] = \
output['variables'].pop('node_shared_libcares')
diff --git a/node.gyp b/node.gyp
index 43a6576206d..c8ba6759246 100644
--- a/node.gyp
+++ b/node.gyp
@@ -14,6 +14,7 @@
'node_module_version%': '',
'node_shared_zlib%': 'false',
@@ -16,6 +16,7 @@
'node_shared_http_parser%': 'false',
+ 'node_shared_nghttp2%': 'false',
'node_shared_cares%': 'false',
'node_shared_libuv%': 'false',
+ 'node_shared_nghttp2%': 'false',
'node_use_openssl%': 'true',
@@ -151,8 +152,15 @@
'type': '<(node_target_type)',
'node_shared_openssl%': 'false',
'node_v8_options%': '',
@@ -176,7 +177,6 @@
'dependencies': [
- 'node_js2c#host',
'node_js2c#host',
- 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ 'node_js2c#host'
+ ],
+
+ 'conditions': [
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [
+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ ]
+ }]
],
'includes': [
@@ -180,8 +180,7 @@
@@ -186,8 +186,7 @@
'include_dirs': [
'src',
'tools/msvs/genfiles',
@@ -74,16 +68,33 @@
],
'sources': [
@@ -929,6 +928,14 @@
'deps/uv/uv.gyp:libuv'
]
}],
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [
+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
+ ],
+ 'include_dirs': [
+ 'deps/nghttp2/lib/includes'
+ ]
+ }],
[ 'node_use_v8_platform=="true"', {
'dependencies': [
'deps/v8/src/v8.gyp:v8_libplatform',
diff --git a/node.gypi b/node.gypi
index ec78df2a339..3990c59ef98 100644
--- a/node.gypi
+++ b/node.gypi
@@ -251,6 +251,10 @@
'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
@@ -133,6 +133,10 @@
'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
}],
+ [ 'node_shared_nghttp2=="false"', {
+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
+ }],
+
[ 'node_shared_cares=="false"', {
'dependencies': [ 'deps/cares/cares.gyp:cares' ],
}],
[ 'OS=="mac"', {
# linking Corefoundation is needed since certain OSX debugging tools
# like Instruments require it for some features