Sun Apr 21 17:19:52 2024 UTC (18d)
libntf: make MKREPRO timestamp compatible with NetBSD 10

In NetBSD 10, make(1) cannot handle :gmtime arguments that are
expressions, resulting in the error message "Unknown modifier '1'".


(rillig)
diff -r1.35 -r1.36 src/external/bsd/ntp/lib/libntp/Makefile
cvs diff -r1.35 -r1.36 src/external/bsd/ntp/lib/libntp/Makefile (expand / switch to unified diff)

--- src/external/bsd/ntp/lib/libntp/Makefile 2024/04/20 08:03:08 1.35
+++ src/external/bsd/ntp/lib/libntp/Makefile 2024/04/21 17:19:52 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2024/04/20 08:03:08 rillig Exp $ 1# $NetBSD: Makefile,v 1.36 2024/04/21 17:19:52 rillig 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,25 +78,25 @@ timetoa.c \ @@ -78,25 +78,25 @@ 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.if ${MKREPRO:Uno} == "yes" 89.if ${MKREPRO:Uno} == "yes"
90MKREPRO_CPPFLAGS.ntp_calendar.c:= \ 90MKREPRO_CPPFLAGS.ntp_calendar.c:= \
91 -DMKREPRO_DATE=\"${%b %e %Y:L:gmtime=${MKREPRO_TIMESTAMP}:Q}\" \ 91 -DMKREPRO_DATE=\"${%b %e %Y:L:${:Ugmtime=${MKREPRO_TIMESTAMP}}:Q}\" \
92 -DMKREPRO_TIME=\"${%T:L:gmtime=${MKREPRO_TIMESTAMP}:Q}\" 92 -DMKREPRO_TIME=\"${%T:L:${:Ugmtime=${MKREPRO_TIMESTAMP}}:Q}\"
93CPPFLAGS.ntp_calendar.c += ${MKREPRO_CPPFLAGS.ntp_calendar.c} 93CPPFLAGS.ntp_calendar.c += ${MKREPRO_CPPFLAGS.ntp_calendar.c}
94.endif 94.endif
95 95
96COPTS.timetoa.c+= ${CC_WNO_FORMAT_TRUNCATION} 96COPTS.timetoa.c+= ${CC_WNO_FORMAT_TRUNCATION}
97COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 97COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
98COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 98COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
99 99
100COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations 100COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations
101 101
102.include <bsd.lib.mk> 102.include <bsd.lib.mk>