Skip to content

Commit

Permalink
deps: fix gyp/gypi for openssl-1.1.1
Browse files Browse the repository at this point in the history
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.

Backport-PR-URL: #26270
PR-URL: #25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
  • Loading branch information
shigeki authored and BethGriggs committed Mar 28, 2019
1 parent 0e7019f commit 70a785c
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 0 deletions.
5 changes: 5 additions & 0 deletions deps/openssl/config/generate_gypi.pl
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
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',
Expand All @@ -131,6 +134,7 @@
target => \%target,
asm => \$asm,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
is_win => \$is_win,
});

Expand All @@ -152,6 +156,7 @@
config => \%config,
target => \%target,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
is_win => \$is_win,
});

Expand Down
16 changes: 16 additions & 0 deletions deps/openssl/config/openssl-cl.gypi.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}-%%',
Expand Down
16 changes: 16 additions & 0 deletions deps/openssl/config/openssl.gypi.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}-%%',
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/openssl_common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 70a785c

Please sign in to comment.