wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix check of -DOPENSSL_USE_APPLINK in $config{cflags}

Browse source 
The previous fix wasn't right.

Also, change all (^|\s) and (\s|$) constructs to (?:^|\s) and (?:\s|$).
Perl seems to like that better.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-16 23:27:13 +01:00
parent 1288f26fb9
commit d918f9cb2d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Configure
View file

@ -1051,7 +1051,7 @@ if (!$no_asm) {
$target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386"); $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
$target{cpuid_asm_src}.=" uplink.c uplink-x86.s" $target{cpuid_asm_src}.=" uplink.c uplink-x86.s"
if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}} if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}}
|| grep /(^|\s)-DOPENSSL_USE_APPLINK(\s|$)/, ${$config{cflags}}); || $config{cflags} =~ /(?:^|\s)-DOPENSSL_USE_APPLINK(?:\s|$)/);
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m})); $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
@ -1171,13 +1171,13 @@ if ($strict_warnings)
unless $ecc eq 'gcc' || $ecc eq 'clang'; unless $ecc eq 'gcc' || $ecc eq 'clang';
foreach $wopt (split /\s+/, $gcc_devteam_warn) foreach $wopt (split /\s+/, $gcc_devteam_warn)
{ {
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)
} }
if ($ecc eq "clang") if ($ecc eq "clang")
{ {
foreach $wopt (split /\s+/, $clang_devteam_warn) foreach $wopt (split /\s+/, $clang_devteam_warn)
{ {
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)
} }
} }
} }
@ -1186,7 +1186,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
{ {
foreach my $wopt (split /\s+/, $memleak_devteam_backtrace) foreach my $wopt (split /\s+/, $memleak_devteam_backtrace)
{ {
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)
} }
if ($target =~ /^BSD-/) if ($target =~ /^BSD-/)
{ {