[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  43b1a3dcc824f234157f71213f9af6848898e4b4 (commit)
      from  0d37bd8058fa7933b0b6d6c2042592bf9daa80d7 (commit)


- Log -----------------------------------------------------------------
commit 43b1a3dcc824f234157f71213f9af6848898e4b4
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 31 13:47:13 2017 +0100

    Allow parallell make in Configure
    
    If someone tries this:
    
        MAKE='make -j8' ./config
    
    then Configure ends up doing this:
    
        make -j8 links depend gentests
    
    Doing those three in parallell leads to a race condition that may very well
    cause issue such as tests not being run (because they all get linked to a
    dummy that does nothing instead of the real test).
    
    To mitigate this, execute the three targets in one make call each.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2332)

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

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

diff --git a/Configure b/Configure
index 5da7cad..da0230a 100755
--- a/Configure
+++ b/Configure
@@ -2041,12 +2041,13 @@ EOF
 	close(OUT);
 } else {
 	my $make_command = "$make PERL=\'$perl\'";
-	my $make_targets = "";
-	$make_targets .= " links" if $symlink;
-	$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
-	$make_targets .= " gentests" if $symlink;
-	(system $make_command.$make_targets) == 0 or exit $?
-		if $make_targets ne "";
+	my @make_targets = ();
+	push @make_targets, "links" if $symlink;
+	push @make_targets, "depend" if $depflags ne $default_depflags && $make_depend;
+	push @make_targets, "gentests" if $symlink;
+	foreach my $make_target (@make_targets) {
+	    (system "$make_command $make_target") == 0 or exit $?;
+	}
 	if ( $perl =~ m@^/@) {
 	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
 	    &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
@@ -2056,8 +2057,8 @@ EOF
 	    &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
 	}
 	if ($depflags ne $default_depflags && !$make_depend) {
-            $warn_make_depend++;
-        }
+	    $warn_make_depend++;
+	}
 }
 
 # create the ms/version32.rc file if needed