From owner-freebsd-i386@freebsd.org Mon Jun 27 05:23:30 2016 Return-Path: Delivered-To: freebsd-i386@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A988B80E8F; Mon, 27 Jun 2016 05:23:30 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 DV Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F1F8620A0; Mon, 27 Jun 2016 05:23:29 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from Xins-MBP.home.us.delphij.net (unknown [IPv6:2601:646:8880:b84b:9507:2171:ac17:c552]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 6406E12D8F; Sun, 26 Jun 2016 22:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1467005009; x=1467019409; bh=KsN91kF/86Xm1inDolqLZF1BMf16yW6+xPVB1k2Ultc=; h=Subject:To:References:Cc:From:Date:In-Reply-To; b=md0ahd7RjUyQ3H+Q7tKjLoch5Z4Z8NtnKNItiOrwlCJbjwsgeCtUjeUmEJ8URsM1T eDvP8282MM4bIOYTW76Hv2VOSoeRKq+7dZcRLHdkDRrtCk1Rewn0FqPC5KcfFrmGC1 c3EAscImKqEwc5V9401yY50ogNzgl7ET28P3VyRE= Subject: Re: FreeBSD_HEAD_i386 - Build #3460 - Failure To: jenkins-admin@FreeBSD.org, delphij@FreeBSD.org, freebsd-current@FreeBSD.org, freebsd-i386@FreeBSD.org References: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org> Cc: d@delphij.net From: Xin Li Message-ID: <5b4c4f64-7f81-1c82-5550-e35e2199bacb@delphij.net> Date: Sun, 26 Jun 2016 22:23:28 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="R6bMmXxt9DVeKJAnk7Lw6DNddk2xFpHLb" X-BeenThere: freebsd-i386@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: I386-specific issues for FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2016 05:23:30 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --R6bMmXxt9DVeKJAnk7Lw6DNddk2xFpHLb Content-Type: multipart/mixed; boundary="ei52eQ3auqCFdrQtmfWL3DkC5kNq7ADrg" From: Xin Li To: jenkins-admin@FreeBSD.org, delphij@FreeBSD.org, freebsd-current@FreeBSD.org, freebsd-i386@FreeBSD.org Cc: d@delphij.net Message-ID: <5b4c4f64-7f81-1c82-5550-e35e2199bacb@delphij.net> Subject: Re: FreeBSD_HEAD_i386 - Build #3460 - Failure References: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org> In-Reply-To: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org> --ei52eQ3auqCFdrQtmfWL3DkC5kNq7ADrg Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable My bad. Proposed fix would be: Index: lib/libmagic/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- lib/libmagic/Makefile (revision 302221) +++ lib/libmagic/Makefile (working copy) @@ -19,7 +19,7 @@ INCS=3D magic.h MAGICPATH?=3D /usr/share/misc CFLAGS+=3D -DMAGIC=3D'"${MAGICPATH}/magic"' -DHAVE_CONFIG_H -CFLAGS+=3D -I${.CURDIR} -I${CONTRDIR}/src +CFLAGS+=3D -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src WARNS?=3D 3 @@ -40,8 +40,8 @@ magic.mgc: mkmagic magic CLEANFILES+=3D 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!=3D awk '$$1 =3D=3D "\#define" && $$2 =3D=3D "VERSION" { print $= $3; exit }' \ Cheers, --ei52eQ3auqCFdrQtmfWL3DkC5kNq7ADrg-- --R6bMmXxt9DVeKJAnk7Lw6DNddk2xFpHLb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJXcLhRAAoJEJW2GBstM+nsxUgP/0yLvoPYJWg7PUgZWOSuLJB4 tZ/XnAy1IsdjASgT1vhPZWIKAaDr+akW28KWCTzT3LcHvRc9nX96DKdLkGQ8JaaF YvEglufqovcw/q0peL+ic7GFKLMZ0qU8uJ3iEbUrDgLGLOYPtlX37O9Q0pTNi5a4 xLIOcsnJ63hAKhTs/cIO9Af8R8cG+O4Fmihvg53dGGPWbywHehRZ8dJBjN3PxrSz Bt20msOMdA4Gtjrm+ff458RfXl4SdjkpagqgNv7/q1sRb4/k19fChqjompS3oB24 SLOS4Kz3wVftCEOf4ihiMz5GpBTYlaPD0wTsSLAH9ukV0gXDk+2wyJexJZnaAc09 F8S9VLvHeSHUN4EnANeASWU9ReuVxE3rghrPuwQJ/L48bLJUC32902FAMokBdIIV 0Nd6FAlrWdhjYQVTpKiwEWlCwfqS4m8PBeCbFoTRTzguXyoipHwG/lZgKNoV92mN h3Av7u2nS/RuNK780MwztpvTcLjQxLXaVU1fRBJyTOPufbtTKkDeikdK31PBV1Ra a3/MYLlXqvYRCtkcpOwvmmxo/VXzwtMB15urvpkeB9XWupOq1wj4Ki99ZoflgDOa QeAEm4gyf2kzwTPTRW8YIU3pbQz1uTL3UAFyDnc7V0bbto1TY5WFdhNFyMjf3Ldx 6fggIhxQCUeZ/QE1eSlQ =WkMH -----END PGP SIGNATURE----- --R6bMmXxt9DVeKJAnk7Lw6DNddk2xFpHLb--