Commit e204399
deps: fix gyp/gypi for openssl-1.1.1
Some of defines and cppflags in the build config of OpenSSL-1.1.1 were
moved to new attributes. Gyp and gypi file generations are needed to be
fixed to include them.
PR-URL: #25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Backport-PR-URL: #256881 parent c581b9a commit e204399Copy full SHA for e204399
File tree
Expand file treeCollapse file tree
4 files changed
+39
-0
lines changedOpen diff view settings
Filter options
- deps/openssl
- config
Expand file treeCollapse file tree
4 files changed
+39
-0
lines changedOpen diff view settings
Collapse file
deps/openssl/config/generate_gypi.pl
Copy file name to clipboardExpand all lines: deps/openssl/config/generate_gypi.pl+5Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
115 | 115 | |
116 | 116 | |
117 | 117 | |
| 118 | + |
| 119 | + |
| 120 | + |
118 | 121 | |
119 | 122 | |
120 | 123 | |
| ||
131 | 134 | |
132 | 135 | |
133 | 136 | |
| 137 | + |
134 | 138 | |
135 | 139 | |
136 | 140 | |
| ||
152 | 156 | |
153 | 157 | |
154 | 158 | |
| 159 | + |
155 | 160 | |
156 | 161 | |
157 | 162 | |
|
Collapse file
deps/openssl/config/openssl-cl.gypi.tmpl
Copy file name to clipboardExpand all lines: deps/openssl/config/openssl-cl.gypi.tmpl+16Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
2 | 2 | |
3 | 3 | |
4 | 4 | |
| 5 | + |
| 6 | + |
| 7 | + |
| 8 | + |
| 9 | + |
| 10 | + |
| 11 | + |
| 12 | + |
| 13 | + |
5 | 14 | |
6 | 15 | |
7 | 16 | |
| 17 | + |
| 18 | + |
| 19 | + |
| 20 | + |
| 21 | + |
| 22 | + |
8 | 23 | |
| 24 | + |
9 | 25 | |
10 | 26 | |
11 | 27 | |
|
Collapse file
deps/openssl/config/openssl.gypi.tmpl
Copy file name to clipboardExpand all lines: deps/openssl/config/openssl.gypi.tmpl+16Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
13 | 13 | |
14 | 14 | |
15 | 15 | |
| 16 | + |
| 17 | + |
| 18 | + |
| 19 | + |
| 20 | + |
| 21 | + |
| 22 | + |
| 23 | + |
| 24 | + |
16 | 25 | |
17 | 26 | |
18 | 27 | |
| 28 | + |
| 29 | + |
| 30 | + |
| 31 | + |
| 32 | + |
| 33 | + |
19 | 34 | |
| 35 | + |
20 | 36 | |
21 | 37 | |
22 | 38 | |
|
Collapse file
deps/openssl/openssl_common.gypi
Copy file name to clipboardExpand all lines: deps/openssl/openssl_common.gypi+2Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
5 | 5 | |
6 | 6 | |
7 | 7 | |
| 8 | + |
| 9 | + |
8 | 10 | |
9 | 11 | |
10 | 12 | |
|
0 commit comments