8000 deps: fix gyp/gypi for openssl-1.1.1 · nodejs/node@e204399 · GitHub
[go: up one dir, main page]
Skip to content

Commit e204399

Browse files
shigekitargos
shigeki
authored and
targos
committed
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: #25688
1 parent c581b9a commit e204399

File tree

4 files changed

+39
-0
lines changed

4 files changed

+39
-0
lines changed

‎deps/openssl/config/generate_gypi.pl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@
115115
system("$cmd") == 0 or die "Error in system($cmd)";
116116
}
117117

118+
$target{'lib_cppflags'} =~ s/-D//g;
119+
my @lib_cppflags = split(/ /, $target{'lib_cppflags'});
120+
118121
# Create openssl.gypi
119122
my $template =
120123
Text::Template->new(TYPE => 'FILE',
@@ -131,6 +134,7 @@
131134
target => \%target,
132135
asm => \$asm,
133136
arch => \$arch,
137+
lib_cppflags => \@lib_cppflags,
134138
is_win => \$is_win,
135139
});
136140

@@ -152,6 +156,7 @@
152156
config => \%config,
153157
target => \%target,
154158
arch => \$arch,
159+
lib_cppflags => \@lib_cppflags,
155160
is_win => \$is_win,
156161
});
157162

‎deps/openssl/config/openssl-cl.gypi.tmpl‎

Expand all lines: deps/openssl/config/openssl-cl.gypi.tmpl
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@
22
'variables': {
33
'openssl_defines_%%-$arch-%%': [
44
%%- foreach $define (@{$config{defines}}) {
5+
$OUT .= " '$define',\n";
6+
}
7+
foreach $define (@lib_cppflags) {
8+
$OUT .= " '$define',\n";
9+
}
10+
foreach $define (@{$target{defines}}) {
11+
$OUT .= " '$define',\n";
12+
}
13+
foreach $define (@{$config{lib_defines}}) {
514
$OUT .= " '$define',\n";
615
} -%% ],
716
'openssl_cflags_%%-$arch-%%': [
17+
%%- foreach $cflag (@{$config{cflags}}) {
18+
$OUT .= " '$cflag',\n";
19+
}
20+
foreach $cflag (@{$config{CFLAGS}}) {
21+
$OUT .= " '$cflag',\n";
22+
} -%%
823
'%%-$target{cflags}-%%',
24+
'%%-$target{CFLAGS}-%%',
925
],
1026
'openssl_ex_libs_%%-$arch-%%': [
1127
'%%-$target{ex_libs}-%%',

‎deps/openssl/config/openssl.gypi.tmpl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,26 @@ foreach $src (@libcrypto_srcs) {
1313
} -%% ],
1414
'openssl_defines_%%-$arch-%%': [
1515
%%- foreach $define (@{$config{defines}}) {
16+
$OUT .= " '$define',\n";
17+
}
18+
foreach $define (@lib_cppflags) {
19+
$OUT .= " '$define',\n";
20+
}
21+
foreach $define (@{$target{defines}}) {
22+
$OUT .= " '$define',\n";
23+
}
24+
foreach $define (@{$config{lib_defines}}) {
1625
$OUT .= " '$define',\n";
1726
} -%% ],
1827
'openssl_cflags_%%-$arch-%%': [
28+
%%- foreach $cflag (@{$config{cflags}}) {
29+
$OUT .= " '$cflag',\n";
30+
}
31+
foreach $cflag (@{$config{CFLAGS}}) {
32+
$OUT .= " '$cflag',\n";
33+
} -%%
1934
'%%-$target{cflags}-%%',
35+
'%%-$target{CFLAGS}-%%',
2036
],
2137
'openssl_ex_libs_%%-$arch-%%': [
2238
'%%-$target{ex_libs}-%%',

‎deps/openssl/openssl_common.gypi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
'openssl/crypto/',
66
'openssl/crypto/include/',
77
'openssl/crypto/modes/',
8+
'openssl/crypto/ec/curve448',
9+
'openssl/crypto/ec/curve448/arch_32',
810
'config/',
911
],
1012
# build options specific to OS

0 commit comments

Comments
 (0)
0