[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d3313a1f4cc6cb641c3bb68fd40625c118a4b7b7 (commit)
       via  18f8e443738f22f59556aa4dde91f3fdcc324b4e (commit)
       via  4ba5ce651790264cdd0e1af3564cf68f8be9ac81 (commit)
      from  ebea0f3014c5f19573afc7a8746278b557e5a1f5 (commit)


- Log -----------------------------------------------------------------
commit d3313a1f4cc6cb641c3bb68fd40625c118a4b7b7
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 13 22:07:02 2018 +0100

    Windows build file: make sure to quote
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5608)

commit 18f8e443738f22f59556aa4dde91f3fdcc324b4e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 13 21:55:52 2018 +0100

    Remove the temporary file in case it wasn't renamed
    
    ...  also, name it with "-$$" added instead of ".$$"
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5608)

commit 4ba5ce651790264cdd0e1af3564cf68f8be9ac81
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 13 19:38:04 2018 +0100

    Remove debugging prints from util/add-depends.pl
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5608)

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

Summary of changes:
 Configurations/windows-makefile.tmpl |  2 +-
 util/add-depends.pl                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 3025b04..b2742e0 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -382,7 +382,7 @@ distclean: clean
 
 depend:
 	@ rem {- output_off() if $disabled{makedepend}; "" -}
-	@ $(PERL) $(SRCDIR)\util\add-depends.pl
+	@ "$(PERL)" "$(SRCDIR)\util\add-depends.pl"
 	@ rem {- output_on() if $disabled{makedepend}; "" -}
 
 # Install helper targets #############################################
diff --git a/util/add-depends.pl b/util/add-depends.pl
index a7b07b6..573986d 100644
--- a/util/add-depends.pl
+++ b/util/add-depends.pl
@@ -12,16 +12,14 @@ use configdata;
 use File::Compare qw(compare_text);
 
 my $buildfile = $config{build_file};
-my $buildfile_new = "$buildfile.$$";
+my $buildfile_new = "$buildfile-$$";
 my $depext = $target{dep_extension} || ".d";
 my @deps =
-    grep { print STDERR "$_ exists: ", -f $_ ? "yes" : "no", "\n"; -f $_ }
+    grep { -f $_ }
     map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
     grep { $unified_info{sources}->{$_}->[0] =~ /\.cc?$/ }
     keys %{$unified_info{sources}};
 
-print STDERR "\@deps = ( ", join(", ", @deps), " )\n";
-
 open IBF, $buildfile or die "Trying to read $buildfile: $!\n";
 open OBF, '>', $buildfile_new or die "Trying to write $buildfile_new: $!\n";
 while (<IBF>) {
@@ -47,4 +45,6 @@ if (compare_text($buildfile_new, $buildfile) != 0) {
     rename $buildfile_new, $buildfile
         or die "Trying to rename $buildfile_new -> $buildfile: $!\n";
 }
-
+# On VMS, we want to remove all generations of this file, in case there are
+# more than one
+while (unlink $buildfile_new) {}