Module Name: src
Committed By: martin
Date: Fri Apr 19 09:01:35 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #663):
external/bsd/ntp/lib/libntp/Makefile: revision 1.30
external/bsd/ntp/lib/libntp/Makefile: revision 1.31
external/bsd/ntp/lib/libntp/Makefile: revision 1.28
external/bsd/ntp/lib/libntp/Makefile: revision 1.29
use ${MKREPRO_TIMESTAMP} for baking in the date and time.
fix format.
remove now-unused assignment
Format MKREPRO_TIMESTAMP with "%b %d %Y" to correctly substitute __DATE__
To generate a diff of this commit:
cvs rdiff -u -r1.25.6.1 -r1.25.6.2 src/external/bsd/ntp/lib/libntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.25.6.1 src/external/bsd/ntp/lib/libntp/Makefile:1.25.6.2
--- src/external/bsd/ntp/lib/libntp/Makefile:1.25.6.1 Fri Aug 11 13:42:57 2023
+++ src/external/bsd/ntp/lib/libntp/Makefile Fri Apr 19 09:01:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25.6.1 2023/08/11 13:42:57 martin Exp $
+# $NetBSD: Makefile,v 1.25.6.2 2024/04/19 09:01:35 martin Exp $
LIBISPRIVATE=yes
@@ -86,17 +86,10 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
# For MKREPRO, avoid using __DATE__ and __TIME__.
-# Instead, use the date and time from ${IMPORTDATE_FILE}.
-#
-# The file should contain one line, like this:
-# Fri Dec 27 19:28:17 EST 2013 (import)
-#
+# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
-IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
-MKREPRO_DATE != ${TOOL_AWK} '{printf "%3s %2d %4d", $$2, $$3, $$6}' \
- <${IMPORTDATE_FILE} # "Mmm DD YYYY"
-MKREPRO_TIME != ${TOOL_AWK} '{print $$4}' \
- <${IMPORTDATE_FILE} # "HH:MM:SS"
+MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%b %d %Y"
+MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
