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
This commit is contained in:
parent
d294fbecbe
commit
2e449e52b6
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user