daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: https://github.com/nodejs/node/pull/25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
pull/25649/head
Shigeki Ohtsu 2018-05-05 23:49:07 +09:00 committed by Sam Roberts
parent 4231ad04f0
commit 1c5b8e5e24
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/openssl/config/generate_gypi.pl vendored
View File

@ -115,6 +115,9 @@ foreach my $src (@generated_srcs) {
system("$cmd") == 0 or die "Error in system($cmd)";
}
$target{'lib_cppflags'} =~ s/-D//g;
my @lib_cppflags = split(/ /, $target{'lib_cppflags'});
# Create openssl.gypi
my $template =
Text::Template->new(TYPE => 'FILE',
@ -131,6 +134,7 @@ my $gypi = $template->fill_in(
target => \%target,
asm => \$asm,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
is_win => \$is_win,
});
@ -152,6 +156,7 @@ my $clgypi = $cltemplate->fill_in(
config => \%config,
target => \%target,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
is_win => \$is_win,
});

16
deps/openssl/config/openssl-cl.gypi.tmpl vendored
View File

@ -2,10 +2,26 @@
'variables': {
'openssl_defines_%%-$arch-%%': [
%%- foreach $define (@{$config{defines}}) {
$OUT .= " '$define',\n";
}
foreach $define (@lib_cppflags) {
$OUT .= " '$define',\n";
}
foreach $define (@{$target{defines}}) {
$OUT .= " '$define',\n";
}
foreach $define (@{$config{lib_defines}}) {
$OUT .= " '$define',\n";
} -%% ],
'openssl_cflags_%%-$arch-%%': [
%%- foreach $cflag (@{$config{cflags}}) {
$OUT .= " '$cflag',\n";
}
foreach $cflag (@{$config{CFLAGS}}) {
$OUT .= " '$cflag',\n";
} -%%
'%%-$target{cflags}-%%',
'%%-$target{CFLAGS}-%%',
],
'openssl_ex_libs_%%-$arch-%%': [
'%%-$target{ex_libs}-%%',

16
deps/openssl/config/openssl.gypi.tmpl vendored
View File

@ -13,10 +13,26 @@ foreach $src (@libcrypto_srcs) {
} -%% ],
'openssl_defines_%%-$arch-%%': [
%%- foreach $define (@{$config{defines}}) {
$OUT .= " '$define',\n";
}
foreach $define (@lib_cppflags) {
$OUT .= " '$define',\n";
}
foreach $define (@{$target{defines}}) {
$OUT .= " '$define',\n";
}
foreach $define (@{$config{lib_defines}}) {
$OUT .= " '$define',\n";
} -%% ],
'openssl_cflags_%%-$arch-%%': [
%%- foreach $cflag (@{$config{cflags}}) {
$OUT .= " '$cflag',\n";
}
foreach $cflag (@{$config{CFLAGS}}) {
$OUT .= " '$cflag',\n";
} -%%
'%%-$target{cflags}-%%',
'%%-$target{CFLAGS}-%%',
],
'openssl_ex_libs_%%-$arch-%%': [
'%%-$target{ex_libs}-%%',

2
deps/openssl/openssl_common.gypi vendored
View File

@ -5,6 +5,8 @@
'openssl/crypto/',
'openssl/crypto/include/',
'openssl/crypto/modes/',
'openssl/crypto/ec/curve448',
'openssl/crypto/ec/curve448/arch_32',
'config/',
],
# build options specific to OS