1 |
commit: d904f25f8d73ab12e9a0a6e33da052d9f5f8a1ed |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 21 12:00:09 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 21 12:01:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d904f25f |
7 |
|
8 |
net-libs/nodejs: Use upstream patches for shared nghttp2 support. |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
.../nodejs/files/nodejs-8.9.0-shared-nghttp2.patch | 95 ++++++++++------------ |
13 |
.../nodejs/files/nodejs-9.2.0-shared-nghttp2.patch | 75 +++++++++-------- |
14 |
2 files changed, 88 insertions(+), 82 deletions(-) |
15 |
|
16 |
diff --git a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch |
17 |
index dfccb1b0aea..c5e0d837f30 100644 |
18 |
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch |
19 |
+++ b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch |
20 |
@@ -1,8 +1,10 @@ |
21 |
+diff --git a/configure b/configure |
22 |
+index 5703a70cb2d..3b6fc7347db 100755 |
23 |
--- a/configure |
24 |
+++ b/configure |
25 |
-@@ -182,6 +182,27 @@ |
26 |
- dest='shared_http_parser_libpath', |
27 |
- help='a directory to search for the shared http_parser DLL') |
28 |
+@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath', |
29 |
+ dest='shared_libuv_libpath', |
30 |
+ help='a directory to search for the shared libuv DLL') |
31 |
|
32 |
+shared_optgroup.add_option('--shared-nghttp2', |
33 |
+ action='store_true', |
34 |
@@ -23,48 +25,40 @@ |
35 |
+shared_optgroup.add_option('--shared-nghttp2-libpath', |
36 |
+ action='store', |
37 |
+ dest='shared_nghttp2_libpath', |
38 |
-+ help='a directory to search for the shared nghttp2 DLL') |
39 |
++ help='a directory to search for the shared nghttp2 DLLs') |
40 |
+ |
41 |
- shared_optgroup.add_option('--shared-libuv', |
42 |
+ shared_optgroup.add_option('--shared-openssl', |
43 |
action='store_true', |
44 |
- dest='shared_libuv', |
45 |
-@@ -1360,6 +1381,7 @@ |
46 |
- configure_node(output) |
47 |
- configure_library('zlib', output) |
48 |
+ dest='shared_openssl', |
49 |
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output) |
50 |
configure_library('http_parser', output) |
51 |
-+configure_library('nghttp2', output) |
52 |
configure_library('libuv', output) |
53 |
configure_library('libcares', output) |
54 |
++configure_library('nghttp2', output) |
55 |
# stay backwards compatible with shared cares builds |
56 |
+ output['variables']['node_shared_cares'] = \ |
57 |
+ output['variables'].pop('node_shared_libcares') |
58 |
+diff --git a/node.gyp b/node.gyp |
59 |
+index 86a4331a4ed..38241302e26 100644 |
60 |
--- a/node.gyp |
61 |
+++ b/node.gyp |
62 |
-@@ -14,6 +14,7 @@ |
63 |
- 'node_module_version%': '', |
64 |
- 'node_shared_zlib%': 'false', |
65 |
+@@ -16,6 +16,7 @@ |
66 |
'node_shared_http_parser%': 'false', |
67 |
-+ 'node_shared_nghttp2%': 'false', |
68 |
'node_shared_cares%': 'false', |
69 |
'node_shared_libuv%': 'false', |
70 |
++ 'node_shared_nghttp2%': 'false', |
71 |
'node_use_openssl%': 'true', |
72 |
-@@ -151,8 +152,15 @@ |
73 |
- 'type': '<(node_target_type)', |
74 |
+ 'node_shared_openssl%': 'false', |
75 |
+ 'node_v8_options%': '', |
76 |
+@@ -177,7 +178,6 @@ |
77 |
|
78 |
'dependencies': [ |
79 |
-- 'node_js2c#host', |
80 |
+ 'node_js2c#host', |
81 |
- 'deps/nghttp2/nghttp2.gyp:nghttp2' |
82 |
-+ 'node_js2c#host' |
83 |
-+ ], |
84 |
-+ |
85 |
-+ 'conditions': [ |
86 |
-+ [ 'node_shared_nghttp2=="false"', { |
87 |
-+ 'dependencies': [ |
88 |
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2' |
89 |
-+ ] |
90 |
-+ }] |
91 |
], |
92 |
|
93 |
'includes': [ |
94 |
-@@ -180,8 +180,7 @@ |
95 |
+@@ -187,8 +187,7 @@ |
96 |
'include_dirs': [ |
97 |
'src', |
98 |
'tools/msvs/genfiles', |
99 |
@@ -74,32 +68,33 @@ |
100 |
], |
101 |
|
102 |
'sources': [ |
103 |
-@@ -691,6 +696,15 @@ |
104 |
- 'deps/http_parser/http_parser.gyp:http_parser' |
105 |
- ] |
106 |
- }], |
107 |
-+ [ 'node_shared_nghttp2=="false"', { |
108 |
-+ 'dependencies': [ |
109 |
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2' |
110 |
-+ ], |
111 |
-+ 'defines': [ |
112 |
-+ # We're using the nghttp2 static lib |
113 |
-+ 'NGHTTP2_STATICLIB' |
114 |
-+ ] |
115 |
-+ }], |
116 |
- [ 'node_shared_libuv=="false"', { |
117 |
- 'dependencies': [ |
118 |
- 'deps/uv/uv.gyp:libuv' |
119 |
+@@ -930,6 +929,14 @@ |
120 |
+ 'deps/uv/uv.gyp:libuv' |
121 |
+ ] |
122 |
+ }], |
123 |
++ [ 'node_shared_nghttp2=="false"', { |
124 |
++ 'dependencies': [ |
125 |
++ 'deps/nghttp2/nghttp2.gyp:nghttp2' |
126 |
++ ], |
127 |
++ 'include_dirs': [ |
128 |
++ 'deps/nghttp2/lib/includes' |
129 |
++ ] |
130 |
++ }], |
131 |
+ [ 'node_use_v8_platform=="true"', { |
132 |
+ 'dependencies': [ |
133 |
+ 'deps/v8/src/v8.gyp:v8_libplatform', |
134 |
+diff --git a/node.gypi b/node.gypi |
135 |
+index ec78df2a339..3990c59ef98 100644 |
136 |
--- a/node.gypi |
137 |
+++ b/node.gypi |
138 |
-@@ -251,6 +251,10 @@ |
139 |
- 'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ], |
140 |
+@@ -259,6 +259,10 @@ |
141 |
+ [ 'node_shared_libuv=="false"', { |
142 |
+ 'dependencies': [ 'deps/uv/uv.gyp:libuv' ], |
143 |
}], |
144 |
- |
145 |
++ |
146 |
+ [ 'node_shared_nghttp2=="false"', { |
147 |
+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], |
148 |
+ }], |
149 |
-+ |
150 |
- [ 'node_shared_cares=="false"', { |
151 |
- 'dependencies': [ 'deps/cares/cares.gyp:cares' ], |
152 |
- }], |
153 |
+ |
154 |
+ [ 'OS=="win"', { |
155 |
+ 'sources': [ |
156 |
|
157 |
diff --git a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch |
158 |
index a145c0c7116..e8483ab279f 100644 |
159 |
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch |
160 |
+++ b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch |
161 |
@@ -1,8 +1,10 @@ |
162 |
+diff --git a/configure b/configure |
163 |
+index 5703a70cb2d..3b6fc7347db 100755 |
164 |
--- a/configure |
165 |
+++ b/configure |
166 |
-@@ -182,6 +182,27 @@ |
167 |
- dest='shared_http_parser_libpath', |
168 |
- help='a directory to search for the shared http_parser DLL') |
169 |
+@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath', |
170 |
+ dest='shared_libuv_libpath', |
171 |
+ help='a directory to search for the shared libuv DLL') |
172 |
|
173 |
+shared_optgroup.add_option('--shared-nghttp2', |
174 |
+ action='store_true', |
175 |
@@ -23,48 +25,40 @@ |
176 |
+shared_optgroup.add_option('--shared-nghttp2-libpath', |
177 |
+ action='store', |
178 |
+ dest='shared_nghttp2_libpath', |
179 |
-+ help='a directory to search for the shared nghttp2 DLL') |
180 |
++ help='a directory to search for the shared nghttp2 DLLs') |
181 |
+ |
182 |
- shared_optgroup.add_option('--shared-libuv', |
183 |
+ shared_optgroup.add_option('--shared-openssl', |
184 |
action='store_true', |
185 |
- dest='shared_libuv', |
186 |
-@@ -1360,6 +1381,7 @@ |
187 |
- configure_node(output) |
188 |
- configure_library('zlib', output) |
189 |
+ dest='shared_openssl', |
190 |
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output) |
191 |
configure_library('http_parser', output) |
192 |
-+configure_library('nghttp2', output) |
193 |
configure_library('libuv', output) |
194 |
configure_library('libcares', output) |
195 |
++configure_library('nghttp2', output) |
196 |
# stay backwards compatible with shared cares builds |
197 |
+ output['variables']['node_shared_cares'] = \ |
198 |
+ output['variables'].pop('node_shared_libcares') |
199 |
+diff --git a/node.gyp b/node.gyp |
200 |
+index 43a6576206d..c8ba6759246 100644 |
201 |
--- a/node.gyp |
202 |
+++ b/node.gyp |
203 |
-@@ -14,6 +14,7 @@ |
204 |
- 'node_module_version%': '', |
205 |
- 'node_shared_zlib%': 'false', |
206 |
+@@ -16,6 +16,7 @@ |
207 |
'node_shared_http_parser%': 'false', |
208 |
-+ 'node_shared_nghttp2%': 'false', |
209 |
'node_shared_cares%': 'false', |
210 |
'node_shared_libuv%': 'false', |
211 |
++ 'node_shared_nghttp2%': 'false', |
212 |
'node_use_openssl%': 'true', |
213 |
-@@ -151,8 +152,15 @@ |
214 |
- 'type': '<(node_target_type)', |
215 |
+ 'node_shared_openssl%': 'false', |
216 |
+ 'node_v8_options%': '', |
217 |
+@@ -176,7 +177,6 @@ |
218 |
|
219 |
'dependencies': [ |
220 |
-- 'node_js2c#host', |
221 |
+ 'node_js2c#host', |
222 |
- 'deps/nghttp2/nghttp2.gyp:nghttp2' |
223 |
-+ 'node_js2c#host' |
224 |
-+ ], |
225 |
-+ |
226 |
-+ 'conditions': [ |
227 |
-+ [ 'node_shared_nghttp2=="false"', { |
228 |
-+ 'dependencies': [ |
229 |
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2' |
230 |
-+ ] |
231 |
-+ }] |
232 |
], |
233 |
|
234 |
'includes': [ |
235 |
-@@ -180,8 +180,7 @@ |
236 |
+@@ -186,8 +186,7 @@ |
237 |
'include_dirs': [ |
238 |
'src', |
239 |
'tools/msvs/genfiles', |
240 |
@@ -74,16 +68,33 @@ |
241 |
], |
242 |
|
243 |
'sources': [ |
244 |
+@@ -929,6 +928,14 @@ |
245 |
+ 'deps/uv/uv.gyp:libuv' |
246 |
+ ] |
247 |
+ }], |
248 |
++ [ 'node_shared_nghttp2=="false"', { |
249 |
++ 'dependencies': [ |
250 |
++ 'deps/nghttp2/nghttp2.gyp:nghttp2' |
251 |
++ ], |
252 |
++ 'include_dirs': [ |
253 |
++ 'deps/nghttp2/lib/includes' |
254 |
++ ] |
255 |
++ }], |
256 |
+ [ 'node_use_v8_platform=="true"', { |
257 |
+ 'dependencies': [ |
258 |
+ 'deps/v8/src/v8.gyp:v8_libplatform', |
259 |
+diff --git a/node.gypi b/node.gypi |
260 |
+index ec78df2a339..3990c59ef98 100644 |
261 |
--- a/node.gypi |
262 |
+++ b/node.gypi |
263 |
-@@ -251,6 +251,10 @@ |
264 |
- 'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ], |
265 |
+@@ -133,6 +133,10 @@ |
266 |
+ 'dependencies': [ 'deps/uv/uv.gyp:libuv' ], |
267 |
}], |
268 |
|
269 |
+ [ 'node_shared_nghttp2=="false"', { |
270 |
+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], |
271 |
+ }], |
272 |
+ |
273 |
- [ 'node_shared_cares=="false"', { |
274 |
- 'dependencies': [ 'deps/cares/cares.gyp:cares' ], |
275 |
- }], |
276 |
+ [ 'OS=="mac"', { |
277 |
+ # linking Corefoundation is needed since certain OSX debugging tools |
278 |
+ # like Instruments require it for some features |