krb5 commit [krb5-1.11]: Fix race in util/profile/Makefile.in

Tom Yu tlyu at mit.edu
Fri Feb 6 18:44:39 EST 2015


https://github.com/krb5/krb5/commit/640080a7c47238f0b63e35cfb484308f76db4992
commit 640080a7c47238f0b63e35cfb484308f76db4992
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Oct 17 14:02:14 2013 -0400

    Fix race in util/profile/Makefile.in
    
    $(BUILDTOP)/include/profile.h was being updated by two different
    rules, which could collide with make -j.  Use a dependency from
    includes instead of a redundant rule.
    
    (cherry picked from commit 4d3827ac1b0e9e6447a132c57f3e2d74d3dfe8a9)
    
    ticket: 8111 (new)
    version_fixed: 1.11.6
    status: resolved

 src/util/profile/Makefile.in |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index e88094e..f02eae1 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -68,13 +68,7 @@ generate-files-mac: profile.h
 $(PROFILE_HDR):: profile.h
 	$(CP) profile.h "$@"
 
-includes:: profile.h
-	if cmp profile.h \
-	$(BUILDTOP)/include/profile.h >/dev/null 2>&1; then :; \
-	else \
-		(set -x; $(RM) $(BUILDTOP)/include/profile.h; \
-		 $(CP) profile.h $(BUILDTOP)/include/profile.h) ; \
-	fi
+includes:: $(PROFILE_HDR)
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/profile.h test2.ini test3.ini test2.ini.bak


More information about the cvs-krb5 mailing list