From: Simon Schubert Date: Thu, 16 Nov 2006 23:46:53 +0000 (+0000) Subject: Disable use of wide char functions for mkmagic.nx, a host tool. This X-Git-Tag: v2.0.1~4106 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/e5df28916cfed65ccc0c22d7bd88d8a4d7024228 Disable use of wide char functions for mkmagic.nx, a host tool. This unbreaks buildworld for pre-citrus machines (1.2-RELEASE). Reported-by: Thomas E. Spanjaard --- diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index e0ef7ede00..2cfd7ef3ac 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libmagic/Makefile,v 1.15 2006/11/13 17:45:05 pavalos Exp $ +# $DragonFly: src/lib/libmagic/Makefile,v 1.16 2006/11/16 23:46:53 corecode Exp $ CONTRIBDIR= ${.CURDIR}/../../contrib/file-4 MAGICDIR= ${CONTRIBDIR}/magic @@ -58,6 +58,7 @@ CLEANFILES+= mkmagic.nx build-tools: mkmagic.nx NXCFLAGS+= -DHAVE_CONFIG_H -DCOMPILE_ONLY -I${.CURDIR} -I${CONTRIBDIR}/src +NXCFLAGS+= -DBOOTSTRAPPING mkmagic.nx: apprentice.c funcs.c magic.c print.c ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET} diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index d9ac4204d2..c7feb51363 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -1,4 +1,4 @@ -/* $DragonFly: src/lib/libmagic/config.h,v 1.7 2006/11/11 22:04:51 pavalos Exp $ */ +/* $DragonFly: src/lib/libmagic/config.h,v 1.8 2006/11/16 23:46:53 corecode Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -117,6 +117,7 @@ /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 +#ifndef BOOTSTRAPPING /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 @@ -125,6 +126,7 @@ /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 +#endif /* BOOTSTRAPPING */ /* Define to 1 if `major', `minor', and `makedev' are declared in . */