[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5a6a6d59a642e0ee437e3753c152b67e92d3cb3f (commit)
      from  32ab57cbb4877ce7e6b4eb3f9b3cfbb0ff7cd10b (commit)


- Log -----------------------------------------------------------------
commit 5a6a6d59a642e0ee437e3753c152b67e92d3cb3f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 25 00:06:46 2021 +0100

    Makefile: Only update doc/build.info when there's an actual change
    
    Fixes #14307
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14309)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b0aff03ad1..aa4b3ec0ec 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1096,7 +1096,16 @@ generate_fuzz_oids:
 generate_doc_buildinfo:
 	( $(PERL) -I$(BLDDIR) -Mconfigdata \
                 $(SRCDIR)/util/dofile.pl -o Makefile \
-                        $(SRCDIR)/doc/build.info.in > $(SRCDIR)/doc/build.info )
+                        $(SRCDIR)/doc/build.info.in \
+                        > $(SRCDIR)/doc/build.info.new; \
+          if ( test -e $(SRCDIR)/doc/build.info \
+               && cmp $(SRCDIR)/doc/build.info.new $(SRCDIR)/doc/build.info \
+                  > /dev/null ); \
+          then \
+                rm $(SRCDIR)/doc/build.info.new; \
+          else \
+                mv $(SRCDIR)/doc/build.info.new $(SRCDIR)/doc/build.info; \
+          fi )
 
 # Set to -force to force a rebuild
 ERROR_REBUILD=