Re: FreeBSD_HEAD_i386 - Build #3460 - Failure
My bad. Proposed fix would be: Index: lib/libmagic/Makefile === --- lib/libmagic/Makefile (revision 302221) +++ lib/libmagic/Makefile (working copy) @@ -19,7 +19,7 @@ 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 @@ -40,8 +40,8 @@ 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, signature.asc Description: OpenPGP digital signature
FreeBSD_HEAD_i386 - Build #3460 - Failure
FreeBSD_HEAD_i386 - Build #3460 - Failure: Build information: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3460/ Full change log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3460/changes Full build log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3460/console Change summaries: 302221 by delphij: MFV r302218: file 5.28. Relnotes: yes MFC after: 2 weeks Approved by:re (gjb) The end of the build log: [...truncated 15261 lines...] cc -O2 -pipe -I/usr/src/usr.bin/mkcsmapper_static -I/usr/src/usr.bin/mkcsmapper_static/../mkcsmapper -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libiconv_modules/mapper_std -g -MD -MF.depend.citrus_db_hash.o -MTcitrus_db_hash.o -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -c /usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv/citrus_db_hash.c -o citrus_db_hash.o --- build-tools_rescue/rescue --- --- obj --- --- obj_crunchdir_dmesg --- cd /usr/src/rescue/rescue/../../sbin/dmesg && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/dmesg/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- build-tools_usr.bin/mkcsmapper_static --- --- citrus_lookup_factory.o --- cc -O2 -pipe -I/usr/src/usr.bin/mkcsmapper_static -I/usr/src/usr.bin/mkcsmapper_static/../mkcsmapper -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libiconv_modules/mapper_std -g -MD -MF.depend.citrus_lookup_factory.o -MTcitrus_lookup_factory.o -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -c /usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv/citrus_lookup_factory.c -o citrus_lookup_factory.o --- build-tools_rescue/rescue --- --- obj --- --- obj_crunchdir_dump --- cd /usr/src/rescue/rescue/../../sbin/dump && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/dump/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- build-tools_usr.bin/mkesdb_static --- --- lex.o --- cc -O2 -pipe -I/usr/src/usr.bin/mkesdb_static -I/usr/src/usr.bin/mkesdb_static/../mkesdb -I/usr/src/usr.bin/mkesdb_static/../../lib/libc/iconv -g -MD -MF.depend.lex.o -MTlex.o -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -c lex.c -o lex.o --- build-tools_rescue/rescue --- --- obj --- --- obj_crunchdir_dumpfs --- cd /usr/src/rescue/rescue/../../sbin/dumpfs && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/dumpfs/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- build-tools_usr.bin/mkcsmapper_static --- --- citrus_pivot_factory.o --- cc -O2 -pipe -I/usr/src/usr.bin/mkcsmapper_static -I/usr/src/usr.bin/mkcsmapper_static/../mkcsmapper -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libiconv_modules/mapper_std -g -MD -MF.depend.citrus_pivot_factory.o -MTcitrus_pivot_factory.o -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -c /usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv/citrus_pivot_factory.c -o citrus_pivot_factory.o --- build-tools_rescue/rescue --- --- obj --- --- obj_crunchdir_dumpon --- cd /usr/src/rescue/rescue/../../sbin/dumpon && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/dumpon/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- obj --- --- obj_crunchdir_fsck --- cd /usr/src/rescue/rescue/../../sbin/fsck && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/fsck/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- obj --- --- obj_crunchdir_fsck_ffs --- cd /usr/src/rescue/rescue/../../sbin/fsck_ffs && MK_AUTO_OBJ=no MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1 MAKEOBJDIRPREFIX=/usr/obj/usr/src/rescue/rescue /usr/obj/usr/src/make.i386/bmake DIRPRFX=rescue/rescue/fsck_ffs/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no obj --- build-tools_usr.bin/mkcsmapper_static --- --- lex.o --- cc -O2 -pipe -I/usr/src/usr.bin/mkcsmapper_static -I/usr/src/usr.bin/mkcsmapper_static/../mkcsmapper -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libc/iconv -I/usr/src/usr.bin/mkcsmapper_static/../../lib/libiconv_modules/mapper_std -g -MD -MF.depend.lex.o -MTlex.o -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -c lex.c -o