Permalink
Browse files

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
  • Loading branch information...
shigeki authored and targos committed May 5, 2018
1 parent c581b9a commit e2043999bda32a9855429d2fa392b749139f2562
@@ -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',
@@ -131,6 +134,7 @@
target => \%target,
asm => \$asm,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
is_win => \$is_win,
});

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

@@ -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}-%%',
@@ -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}-%%',
@@ -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

0 comments on commit e204399

Please sign in to comment.