From d122acbd72207f5ffd043c264e5731a9ac1910d3 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 21 Apr 2024 17:19:52 +0000 Subject: [PATCH] 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'". --- external/bsd/ntp/lib/libntp/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external/bsd/ntp/lib/libntp/Makefile b/external/bsd/ntp/lib/libntp/Makefile index 97c46f6f700d..b5d72b35aca8 100644 --- a/external/bsd/ntp/lib/libntp/Makefile +++ b/external/bsd/ntp/lib/libntp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2024/04/20 08:03:08 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2024/04/21 17:19:52 rillig Exp $ LIBISPRIVATE=yes @@ -88,8 +88,8 @@ CPPFLAGS+= -I${IDIST}/sntp/libopts # For MKREPRO, avoid using __DATE__ and __TIME__. .if ${MKREPRO:Uno} == "yes" MKREPRO_CPPFLAGS.ntp_calendar.c:= \ - -DMKREPRO_DATE=\"${%b %e %Y:L:gmtime=${MKREPRO_TIMESTAMP}:Q}\" \ - -DMKREPRO_TIME=\"${%T:L:gmtime=${MKREPRO_TIMESTAMP}:Q}\" + -DMKREPRO_DATE=\"${%b %e %Y:L:${:Ugmtime=${MKREPRO_TIMESTAMP}}:Q}\" \ + -DMKREPRO_TIME=\"${%T:L:${:Ugmtime=${MKREPRO_TIMESTAMP}}:Q}\" CPPFLAGS.ntp_calendar.c += ${MKREPRO_CPPFLAGS.ntp_calendar.c} .endif