From 181061dcc06cfb39a569aba7a75b939a19ca14a3 Mon Sep 17 00:00:00 2001 From: zrj Date: Fri, 10 Feb 2017 10:02:10 +0200 Subject: [PATCH] gencat(1): Limit and mark bootstrap hack. By the git history it was only needed for DragonFly 3.6 changes. But be generous and mark it as 4.1 just in case there were other changes piggybacking on it during crossworld stage. It no longer should be needed and might cause unwanted issues for future developments. While there remove the getline helper too. --- usr.bin/gencat/Makefile | 4 +++- usr.bin/gencat/gencat.c | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile index e0daa021ec..d5d217827f 100644 --- a/usr.bin/gencat/Makefile +++ b/usr.bin/gencat/Makefile @@ -5,6 +5,7 @@ SRCS= gencat.c WARNS?= 2 .if defined(BOOTSTRAPPING) +. if ${WORLD_VERSION} <= 400103 nl_types.h: ../../include/nl_types.h cp ${.CURDIR}/../../include/nl_types.h ${.TARGET} @@ -13,9 +14,10 @@ types.h: ${.CURDIR}/../../sys/sys/types.h cp ${.ALLSRC} sys/${.TARGET} SRCS+= nl_types.h types.h -CFLAGS+= -I${.OBJDIR} -DBOOTSTRAPPING +CFLAGS+= -I${.OBJDIR} CLEANFILES+= nl_types.h CLEANDIRS+= sys +. endif .endif .include diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c index da5a209cb5..996e243181 100644 --- a/usr.bin/gencat/gencat.c +++ b/usr.bin/gencat/gencat.c @@ -84,10 +84,6 @@ up-to-date. Many thanks. #include #include -#ifdef BOOTSTRAPPING -#define getline get_line /* help bootstrap previous stdio.h */ -#endif - struct _msgT { long msgId; char *str; -- 2.11.4.GIT