svn commit: r264774 - in head/kerberos5/lib: libasn1 libgssapi_spnego libhdb libhx509

[Ed Maste]

Author: emaste
Date: Tue Apr 22 20:37:07 2014
New Revision: 264774
URL: http://svnweb.freebsd.org/changeset/base/264774

Log:
  Fix installworld failure when kerberos source files have new timestamps
  
  If a kerberos .hx source file is newer than the .h copy, but the content
  is the same, then during buildworld the "cmp -s || cp" command in the
  .hx.h rule would do nothing, leaving the .h copy with the older
  timestamp.  During installworld the rule would again be invoked, causing
  a failure as neither cmp or cp would exist in the temporary path.
  
  As the underlying issue should be resolved by r262209, unconditionally
  copy the file.
  
  No objection:	peter@
  Tested by:	gjb@
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/kerberos5/lib/libasn1/Makefile
  head/kerberos5/lib/libgssapi_spnego/Makefile
  head/kerberos5/lib/libhdb/Makefile
  head/kerberos5/lib/libhx509/Makefile

Modified: head/kerberos5/lib/libasn1/Makefile
==============================================================================
--- head/kerberos5/lib/libasn1/Makefile	Tue Apr 22 20:21:40 2014	(r264773)
+++ head/kerberos5/lib/libasn1/Makefile	Tue Apr 22 20:37:07 2014	(r264774)
@@ -112,10 +112,10 @@ ${GEN_KX509}: kx509.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 	
 .include <bsd.lib.mk>
 

Modified: head/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- head/kerberos5/lib/libgssapi_spnego/Makefile	Tue Apr 22 20:21:40 2014	(r264773)
+++ head/kerberos5/lib/libgssapi_spnego/Makefile	Tue Apr 22 20:37:07 2014	(r264774)
@@ -46,10 +46,10 @@ ${GEN}: spnego.asn1 spnego.opt
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 

Modified: head/kerberos5/lib/libhdb/Makefile
==============================================================================
--- head/kerberos5/lib/libhdb/Makefile	Tue Apr 22 20:21:40 2014	(r264773)
+++ head/kerberos5/lib/libhdb/Makefile	Tue Apr 22 20:37:07 2014	(r264774)
@@ -91,10 +91,10 @@ ${GEN}: hdb.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 

Modified: head/kerberos5/lib/libhx509/Makefile
==============================================================================
--- head/kerberos5/lib/libhx509/Makefile	Tue Apr 22 20:21:40 2014	(r264773)
+++ head/kerberos5/lib/libhx509/Makefile	Tue Apr 22 20:37:07 2014	(r264774)
@@ -286,10 +286,10 @@ ${GEN_CRMF}: crmf.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>