Fri Apr 19 14:58:18 2024 UTC (20d)
Increase MKREPRO robustness
 - Use C locale to ensure month abbreviations are as expected
 - bail out if MKREPRO_TIMESTAMP is not defined
 - bail out if resulting __DATE__/__TIME__ replacement strings are empty


(jakllsch)
diff -r1.32 -r1.33 src/external/bsd/ntp/lib/libntp/Makefile
cvs diff -r1.32 -r1.33 src/external/bsd/ntp/lib/libntp/Makefile (expand / switch to unified diff)

--- src/external/bsd/ntp/lib/libntp/Makefile 2024/04/19 13:34:15 1.32
+++ src/external/bsd/ntp/lib/libntp/Makefile 2024/04/19 14:58:18 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.32 2024/04/19 13:34:15 jakllsch Exp $ 1# $NetBSD: Makefile,v 1.33 2024/04/19 14:58:18 jakllsch Exp $
2 2
3LIBISPRIVATE=yes 3LIBISPRIVATE=yes
4 4
5LIB=ntp 5LIB=ntp
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9.include "${.CURDIR}/../Makefile.inc" 9.include "${.CURDIR}/../Makefile.inc"
10 10
11DIST= ${IDIST}/libntp  11DIST= ${IDIST}/libntp
12 12
13.PATH.c: ${DIST} 13.PATH.c: ${DIST}
14 14
@@ -78,26 +78,32 @@ timetoa.c \ @@ -78,26 +78,32 @@ timetoa.c \
78timexsup.c \ 78timexsup.c \
79uglydate.c \ 79uglydate.c \
80vint64ops.c \ 80vint64ops.c \
81work_fork.c \ 81work_fork.c \
82work_thread.c \ 82work_thread.c \
83xsbprintf.c \ 83xsbprintf.c \
84ymd2yd.c 84ymd2yd.c
85 85
86CPPFLAGS+= -I${IDIST}/sntp/libopts 86CPPFLAGS+= -I${IDIST}/sntp/libopts
87 87
88# For MKREPRO, avoid using __DATE__ and __TIME__. 88# For MKREPRO, avoid using __DATE__ and __TIME__.
89# Instead, use the date and time from ${MKREPRO_TIMESTAMP} 89# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
90.if ${MKREPRO:Uno} == "yes" 90.if ${MKREPRO:Uno} == "yes"
91MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%b %e %Y" 91.if ${MKREPRO_TIMESTAMP:Uundefined} == "undefined"
92MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T" 92.error MKREPRO_TIMESTAMP is undefined with MKREPRO active
 93.endif
 94MKREPRO_DATE != env LC_ALL=C ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%b %e %Y"
 95MKREPRO_TIME != env LC_ALL=C ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
 96.if ${MKREPRO_TIME} == "" || ${MKREPRO_TIME} == ""
 97.error empty MKREPRO_DATE or MKREPRO_TIME
 98.endif
93CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\" 99CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
94CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\" 100CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
95.endif 101.endif
96 102
97COPTS.timetoa.c+= ${CC_WNO_FORMAT_TRUNCATION} 103COPTS.timetoa.c+= ${CC_WNO_FORMAT_TRUNCATION}
98COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 104COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
99COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 105COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
100 106
101COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations 107COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations
102 108
103.include <bsd.lib.mk> 109.include <bsd.lib.mk>