Date: Tue, 15 Dec 2015 14:24:32 +0300 From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: Mariusz Zaborski <oshogbo@FreeBSD.org> Cc: NGie Cooper <yanegomi@gmail.com>, FreeBSD-Stable ML <freebsd-stable@FreeBSD.org>, Warner Losh <imp@FreeBSD.org> Subject: Re: make tinderbox broken with LINT-NOINET on ref10-amd64.freebsd.org (if_gif compilation issues) Message-ID: <566FF870.7030106@FreeBSD.org> In-Reply-To: <20151214165858.GA76268@jarvis.whl> References: <CE7F6687-9D20-4804-896B-6F2AF39AECE7@gmail.com> <20151214165111.GA70582@jarvis.whl> <566EF46A.8080704@FreeBSD.org> <20151214165858.GA76268@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)
--QxSqtbGrVJMiipkobPmLMgSxmsNgVhVnK
Content-Type: multipart/mixed;
boundary="------------010703090707000608070509"
This is a multi-part message in MIME format.
--------------010703090707000608070509
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
On 14.12.15 19:58, Mariusz Zaborski wrote:
> On Mon, Dec 14, 2015 at 07:55:06PM +0300, Andrey V. Elsukov wrote:
>> 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,
>>>
>>> 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.
> Not with this but after fixing r276224 it will crash in other place whi=
ch
> r277130 is fixing. :)
Actually, I don't think that my patch will work correctly.
opt_inet.h can contain several options in addition to INET. In such case
the expression
OPT_INET!=3D cat ${KERNBUILDDIR}/opt_inet.h; echo
=2Eif empty(OPT_INET)
will always be true. Are you sure merging of r276224 it works as expected=
?
Probably, this patch will work correctly:
--=20
WBR, Andrey V. Elsukov
--------------010703090707000608070509
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 292257)
+++ 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
=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 grep 'INET[[:space:]]*1' ${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
--------------010703090707000608070509--
--QxSqtbGrVJMiipkobPmLMgSxmsNgVhVnK
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/
iQEcBAEBCAAGBQJWb/hwAAoJEAHF6gQQyKF6PccH/RwqP1PpGSBr3WYVwBEc1Cnk
FLqYTAW1D1Hgl4Ery2fJG8XZPT1CtXsBilAmO73wJ3190t95u3kpvaKG5+KksBml
704Ve8mxWT2aGcgcg2GqPp57jxsHZY6RJYJnOrHBG4Em8sRmxBOpzU+DItxW/BZl
Ja9CuxJl4zMtFh6XVHAo4pp2SghzxaQGvRExxxBTPfhs8/uIi2wBlpu3SLCm3ubk
OLus16WMPVI07GPrh3L5CtL88OAajbk9YyF5VbWkf+/tdUFYlfuRkngTvD1QwpAS
6eeWCVOgpTwDFgaPJd0us9vlrfg7McE4A2M5243l8duWBlZnFoFy09fjoAcuRw4=
=xBmg
-----END PGP SIGNATURE-----
--QxSqtbGrVJMiipkobPmLMgSxmsNgVhVnK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?566FF870.7030106>