Skip to content
Snippets Groups Projects
Commit bff6be2a authored by Michael Lumish's avatar Michael Lumish Committed by GitHub
Browse files

Merge pull request #9962 from murgatroid99/node_no_alpn_compile

Add option to recompile Node library without ALPN support
parents 3313dc1d a99c9476
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
# out. It can be re-enabled for one build by setting the npm config # out. It can be re-enabled for one build by setting the npm config
# variable grpc_uv to true, and it can be re-enabled permanently by # variable grpc_uv to true, and it can be re-enabled permanently by
# setting it to true here. # setting it to true here.
'grpc_uv%': 'false' 'grpc_uv%': 'false',
# Some Node installations use the system installation of OpenSSL, and on
# some systems, the system OpenSSL still does not have ALPN support. This
# will let users recompile gRPC to work without ALPN.
'grpc_alpn%': 'true'
}, },
'target_defaults': { 'target_defaults': {
'include_dirs': [ 'include_dirs': [
...@@ -56,8 +60,6 @@ ...@@ -56,8 +60,6 @@
'conditions': [ 'conditions': [
['runtime=="node" and grpc_uv=="true"', { ['runtime=="node" and grpc_uv=="true"', {
'defines': [ 'defines': [
# Disabling this while bugs are ironed out. Uncomment this to
# re-enable libuv integration in C core.
'GRPC_UV' 'GRPC_UV'
] ]
}], }],
...@@ -75,11 +77,17 @@ ...@@ -75,11 +77,17 @@
'OPENSSL_NO_ASM' 'OPENSSL_NO_ASM'
] ]
}, { }, {
# As of the beginning of 2017, we only support versions of Node with 'conditions': [
# embedded versions of OpenSSL that support ALPN ['grpc_alpn=="true"', {
'defines': [ 'defines': [
'TSI_OPENSSL_ALPN_SUPPORT=1' 'TSI_OPENSSL_ALPN_SUPPORT=1'
], ],
}, {
'defines': [
'TSI_OPENSSL_ALPN_SUPPORT=0'
],
}]
],
'include_dirs': [ 'include_dirs': [
'<(node_root_dir)/deps/openssl/openssl/include', '<(node_root_dir)/deps/openssl/openssl/include',
], ],
......
...@@ -45,7 +45,11 @@ ...@@ -45,7 +45,11 @@
# out. It can be re-enabled for one build by setting the npm config # out. It can be re-enabled for one build by setting the npm config
# variable grpc_uv to true, and it can be re-enabled permanently by # variable grpc_uv to true, and it can be re-enabled permanently by
# setting it to true here. # setting it to true here.
'grpc_uv%': 'false' 'grpc_uv%': 'false',
# Some Node installations use the system installation of OpenSSL, and on
# some systems, the system OpenSSL still does not have ALPN support. This
# will let users recompile gRPC to work without ALPN.
'grpc_alpn%': 'true'
}, },
'target_defaults': { 'target_defaults': {
'include_dirs': [ 'include_dirs': [
...@@ -58,8 +62,6 @@ ...@@ -58,8 +62,6 @@
'conditions': [ 'conditions': [
['runtime=="node" and grpc_uv=="true"', { ['runtime=="node" and grpc_uv=="true"', {
'defines': [ 'defines': [
# Disabling this while bugs are ironed out. Uncomment this to
# re-enable libuv integration in C core.
'GRPC_UV' 'GRPC_UV'
] ]
}], }],
...@@ -77,11 +79,17 @@ ...@@ -77,11 +79,17 @@
'OPENSSL_NO_ASM' 'OPENSSL_NO_ASM'
] ]
}, { }, {
# As of the beginning of 2017, we only support versions of Node with 'conditions': [
# embedded versions of OpenSSL that support ALPN ['grpc_alpn=="true"', {
'defines': [ 'defines': [
'TSI_OPENSSL_ALPN_SUPPORT=1' 'TSI_OPENSSL_ALPN_SUPPORT=1'
], ],
}, {
'defines': [
'TSI_OPENSSL_ALPN_SUPPORT=0'
],
}]
],
'include_dirs': [ 'include_dirs': [
'<(node_root_dir)/deps/openssl/openssl/include', '<(node_root_dir)/deps/openssl/openssl/include',
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment