From: Orgad Shaneh <orgads@gmail.com>
Date: Mon, 19 Sep 2016 12:12:08 +0000 (+0300)
Subject: domd: Preserve Makefile time when it is unchanged
X-Git-Tag: OpenSSL_1_0_2k~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f4ef1c53486d378ab2e2ef3427c0eb1c2fea358f;p=oweals%2Fopenssl.git

domd: Preserve Makefile time when it is unchanged

also on systems with makedepend that does not report its version, or that
its version does not contain "gcc" or "clang".

Some versions of makedepends just overwrite Makefile. Preserve the
timestamp of the previous Makefile, and copy it back if it is unchanged.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1370)
---

diff --git a/util/domd b/util/domd
index 3ac4950c42..bc2a85f7dd 100755
--- a/util/domd
+++ b/util/domd
@@ -11,7 +11,9 @@ if [ "$1" = "-MD" ]; then
 fi
 if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 
-cp Makefile Makefile.save
+# Preserve Makefile timestamp by moving instead of copying (cp -p is GNU only)
+mv Makefile Makefile.save
+cp Makefile.save Makefile
 # fake the presence of Kerberos
 touch $TOP/krb5.h
 if ${MAKEDEPEND} --version 2>&1 | grep "clang" > /dev/null ||
@@ -32,9 +34,10 @@ else
     ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
     RC=$?
 fi
-if ! cmp -s Makefile Makefile.new; then
+if ! cmp -s Makefile.save Makefile.new; then
     mv Makefile.new Makefile
 else
+    mv Makefile.save Makefile
     rm -f Makefile.new
 fi
 # unfake the presence of Kerberos