Date: Sun, 26 Jun 2016 22:23:28 -0700 From: Xin Li <delphij@delphij.net> To: jenkins-admin@FreeBSD.org, delphij@FreeBSD.org, freebsd-current@FreeBSD.org, freebsd-i386@FreeBSD.org Cc: d@delphij.net Subject: Re: FreeBSD_HEAD_i386 - Build #3460 - Failure Message-ID: <5b4c4f64-7f81-1c82-5550-e35e2199bacb@delphij.net> In-Reply-To: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org> References: <986950695.3.1466997448438.JavaMail.jenkins@jenkins-9.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--R6bMmXxt9DVeKJAnk7Lw6DNddk2xFpHLb
Content-Type: multipart/mixed; boundary="ei52eQ3auqCFdrQtmfWL3DkC5kNq7ADrg"
From: Xin Li <delphij@delphij.net>
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5b4c4f64-7f81-1c82-5550-e35e2199bacb>