Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
a99c9476
Commit
a99c9476
authored
8 years ago
by
murgatroid99
Browse files
Options
Downloads
Patches
Plain Diff
Add option to recompile Node library without ALPN support
parent
ed7d06af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
binding.gyp
+15
-7
15 additions, 7 deletions
binding.gyp
templates/binding.gyp.template
+15
-7
15 additions, 7 deletions
templates/binding.gyp.template
with
30 additions
and
14 deletions
binding.gyp
+
15
−
7
View file @
a99c9476
...
@@ -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,10 +77,16 @@
...
@@ -75,10 +77,16 @@
'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',
...
...
This diff is collapsed.
Click to expand it.
templates/binding.gyp.template
+
15
−
7
View file @
a99c9476
...
@@ -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,10 +79,16 @@
...
@@ -77,10 +79,16 @@
'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',
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment