diff options
| author | emaste <emaste@FreeBSD.org> | 2014-04-22 20:37:07 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-04-22 20:37:07 +0000 |
| commit | 2e449e52b69a0f57875093392745a12d55c01a1e (patch) | |
| tree | 40421ab7b8de2533ba11f8c5539bd6397df1da96 /kerberos5 | |
| parent | d294fbecbe054fa6560cd4cdbef4182146b8cbe2 (diff) | |
| download | FreeBSD-src-2e449e52b69a0f57875093392745a12d55c01a1e.zip FreeBSD-src-2e449e52b69a0f57875093392745a12d55c01a1e.tar.gz | |
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
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/lib/libasn1/Makefile | 4 | ||||
| -rw-r--r-- | kerberos5/lib/libgssapi_spnego/Makefile | 4 | ||||
| -rw-r--r-- | kerberos5/lib/libhdb/Makefile | 4 | ||||
| -rw-r--r-- | kerberos5/lib/libhx509/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index b0f969a..dc1de5c 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -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> diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index 9dbd05d..0906265 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -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> diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index b7a51da..a1ed806 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -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> diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index 04eb1c1..3bffda6 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -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> |
