From 6d64ef2c7a90173879afd6410b8d4f8e2371053d Mon Sep 17 00:00:00 2001 From: delphij Date: Fri, 24 Jul 2015 22:08:57 +0000 Subject: [PATCH] MFS r285856: 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 Approved by: re (gjb) git-svn-id: https://svn.freebsd.org/base/releng/10.2@285861 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/ntp/config.h | 5 +++++ 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 28c5c13c6..1aae31582 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 80f15953e..3e67ad7de 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 \ -- 2.42.0