[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d918f9cb2d105675728af8be1e14d23208200c24 (commit)
      from  1288f26fb9c3cfe6c5919b706e30d3f0b2d55b0b (commit)


- Log -----------------------------------------------------------------
commit d918f9cb2d105675728af8be1e14d23208200c24
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 16 23:27:13 2016 +0100

    Fix check of -DOPENSSL_USE_APPLINK in $config{cflags}
    
    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index 2ada702..74ebfb1 100755
--- a/Configure
+++ b/Configure
@@ -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}.=" uplink.c uplink-x86.s"
         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}));
 
@@ -1171,13 +1171,13 @@ if ($strict_warnings)
             unless $ecc eq 'gcc' || $ecc eq 'clang';
 	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")
 		{
 		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)
 		{
-		$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
+		$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)
 		}
 	if ($target =~ /^BSD-/)
 		{