diff options
author | delphij <delphij@FreeBSD.org> | 2015-07-24 19:51:51 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-07-24 19:51:51 +0000 |
commit | b3775fddfbd2146ec26a22154e3d84faba49b9c7 (patch) | |
tree | a969ec47f19dabecbbdbe0edf2e38a6ec8cfb000 /usr.sbin | |
parent | 179248cffdcc96dc3126f9b4640d338b769a4b05 (diff) | |
download | FreeBSD-src-b3775fddfbd2146ec26a22154e3d84faba49b9c7.zip FreeBSD-src-b3775fddfbd2146ec26a22154e3d84faba49b9c7.tar.gz |
MFC r285701:
Use fixed date/time (the time choosen was the time the import was done
on -HEAD) in libntp so we can make reproducible build.
PR: bin/201661
Differential Revision: https://reviews.freebsd.org/D3122
While I'm there also remove libmd from linkage as reported in bin/201738
PR: bin/201738
Submitted by: John Marshall
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ntp/config.h | 5 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 28c5c13..1aae315 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1785,3 +1785,8 @@ typedef union mpinfou { # endif #endif /* !defined(_KERNEL) && !defined(PARSESTREAM) */ +/* + * FreeBSD specific: Explicitly specify date/time for reproducible build. + */ +#define MKREPRO_DATE "Jul 04 2015" +#define MKREPRO_TIME "15:42:16" diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 80f1595..3e67ad7 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -27,8 +27,8 @@ SRCS= cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \ refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \ refclock_zyfer.c version.c -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} ${LIBPTHREAD} -LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd ${LIBOPTS} -lpthread +DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBPTHREAD} +LDADD= ${LIBPARSE} ${LIBNTP} -lm ${LIBOPTS} -lpthread CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \ -I${.CURDIR}/../../../contrib/ntp/include \ |