[28480] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.12]: Fix race in util/profile/Makefile.in
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jul 21 18:34:07 2014
Date: Mon, 21 Jul 2014 18:33:43 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201407212233.s6LMXhdV015910@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/106f45c07139956167d54aacf1674912d3ef3ced
commit 106f45c07139956167d54aacf1674912d3ef3ced
Author: Greg Hudson <ghudson@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: 7967
version_fixed: 1.12.2
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 f1418fb..79ea610 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -62,13 +62,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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
