Re: FreeBSD_HEAD_i386 - Build #3460 - Failure

From: Xin Li <delphij_at_delphij.net>
Date: Sun, 26 Jun 2016 22:23:28 -0700
My bad.  Proposed fix would be:

Index: lib/libmagic/Makefile
===================================================================
--- lib/libmagic/Makefile	(revision 302221)
+++ lib/libmagic/Makefile	(working copy)
_at__at_ -19,7 +19,7 _at__at_ INCS=	magic.h
 MAGICPATH?=	/usr/share/misc

 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${CONTRDIR}/src
+CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src

 WARNS?=		3

_at__at_ -40,8 +40,8 _at__at_ magic.mgc: mkmagic magic

 CLEANFILES+=	mkmagic
 build-tools: mkmagic
-mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c
${BUILD_TOOLS_META}
-	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
+mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c
${INCS} ${BUILD_TOOLS_META}
+	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
 	    ${LDADD}

 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \

Cheers,


Received on Mon Jun 27 2016 - 03:23:30 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:06 UTC