Date: Mon, 14 Dec 2015 19:55:06 +0300 From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: Mariusz Zaborski <oshogbo@FreeBSD.org>, NGie Cooper <yanegomi@gmail.com> Cc: FreeBSD-Stable ML <freebsd-stable@FreeBSD.org> Subject: Re: make tinderbox broken with LINT-NOINET on ref10-amd64.freebsd.org (if_gif compilation issues) Message-ID: <566EF46A.8080704@FreeBSD.org> In-Reply-To: <20151214165111.GA70582@jarvis.whl> References: <CE7F6687-9D20-4804-896B-6F2AF39AECE7@gmail.com> <20151214165111.GA70582@jarvis.whl>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--4SHN7ns3djI0ijo6WfsxLj5f6206dCfpU
Content-Type: multipart/mixed;
boundary="------------000501000909030905050809"
This is a multi-part message in MIME format.
--------------000501000909030905050809
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
On 14.12.15 19:51, Mariusz Zaborski wrote:
> On Mon, Dec 14, 2015 at 06:31:52AM -0800, NGie Cooper wrote:
>> Hi Andrey, Just a heads up that LINT-NOINET seems to be broken on
>> amd64/i386 with if_gif(4) on stable/10. Could you please fix this?=20
>> Thanks, -NGie
> Hi,
>=20
> I already found the problem we need to MFC r276224 and r277130.
I don't think r277130 is related to this problem.
I have this patch and I'm trying to build with them.
--=20
WBR, Andrey V. Elsukov
--------------000501000909030905050809
Content-Type: text/x-patch;
name="modules.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="modules.diff"
Index: stable/10/sys/modules/if_gif/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
--- stable/10/sys/modules/if_gif/Makefile (revision 292213)
+++ stable/10/sys/modules/if_gif/Makefile (working copy)
@@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../ne=
tinet6
=20
KMOD=3D if_gif
-SRCS=3D if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
+SRCS=3D if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
=20
.if !defined(KERNBUILDDIR)
opt_inet.h:
@@ -15,10 +15,11 @@ opt_inet.h:
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
.endif
-
-opt_mrouting.h:
- echo "#define MROUTING 1" > ${.TARGET}
.else
+OPT_INET!=3D cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT=3Dno
+.endif
OPT_INET6!=3D cat ${KERNBUILDDIR}/opt_inet6.h; echo
.if empty(OPT_INET6)
MK_INET6_SUPPORT=3D no
@@ -25,6 +26,10 @@ MK_INET6_SUPPORT=3D no
.endif
.endif
=20
+.if ${MK_INET_SUPPORT} !=3D "no"
+SRCS+=3D in_gif.c
+.endif
+
.if ${MK_INET6_SUPPORT} !=3D "no"
SRCS+=3D in6_gif.c
.endif
--------------000501000909030905050809--
--4SHN7ns3djI0ijo6WfsxLj5f6206dCfpU
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBCAAGBQJWbvRrAAoJEAHF6gQQyKF67uMIALngjH+ucqaU1J2e+dObri9k
zZMP8E6zjmRTMvDMA1dH+E8a/pDspEBNWEulCt0tIMiHznggveWj4bZ8jRztlMfX
8oj17L1RKOszTz9yZ9UnRiO3iRfPibMNleR+ZBLIkyOIoKwze6aTZq4+mGZWzXsI
bttyvs5LP2l1BImViL8hEQ1Cce2NwxbPlVibxMCdsFLcZIjzrD1iF8jkzMeWjGP2
mZGsGv1kBauCaoFmDhdh1aiiWoaUhlxoqR2GGdBD8wXWlc09ciohc/od6mqQo9Hx
CNJeAkuweMXmK9LWNp3Rm3WmDDCtNzbOavh9XSvl+SLWH4bxaDSyAS0FEC/i1fs=
=FIJK
-----END PGP SIGNATURE-----
--4SHN7ns3djI0ijo6WfsxLj5f6206dCfpU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?566EF46A.8080704>