Author: delphij
Date: Fri Jul 24 22:08:57 2015
New Revision: 285861
URL: https://svnweb.freebsd.org/changeset/base/285861

Log:
  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)

Modified:
  releng/10.2/usr.sbin/ntp/config.h
  releng/10.2/usr.sbin/ntp/ntpd/Makefile
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/usr.sbin/ntp/config.h
==============================================================================
--- releng/10.2/usr.sbin/ntp/config.h   Fri Jul 24 22:00:44 2015        
(r285860)
+++ releng/10.2/usr.sbin/ntp/config.h   Fri Jul 24 22:08:57 2015        
(r285861)
@@ -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"

Modified: releng/10.2/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- releng/10.2/usr.sbin/ntp/ntpd/Makefile      Fri Jul 24 22:00:44 2015        
(r285860)
+++ releng/10.2/usr.sbin/ntp/ntpd/Makefile      Fri Jul 24 22:08:57 2015        
(r285861)
@@ -27,8 +27,8 @@ SRCS= cmd_args.c ntp_config.c ntp_contro
        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 \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to