From owner-freebsd-stable@freebsd.org Tue Dec 15 11:25:08 2015 Return-Path: Delivered-To: freebsd-stable@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 78797A43124 for ; Tue, 15 Dec 2015 11:25:08 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:1900:2254:206a::19:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx2.freebsd.org", Issuer "Gandi Standard SSL CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DC051A1B; Tue, 15 Dec 2015 11:25:08 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from butcher-nb.yandex.net (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx2.freebsd.org (Postfix) with ESMTP id 384A32B05; Tue, 15 Dec 2015 11:25:05 +0000 (UTC) (envelope-from ae@FreeBSD.org) Subject: Re: make tinderbox broken with LINT-NOINET on ref10-amd64.freebsd.org (if_gif compilation issues) To: Mariusz Zaborski References: <20151214165111.GA70582@jarvis.whl> <566EF46A.8080704@FreeBSD.org> <20151214165858.GA76268@jarvis.whl> Cc: NGie Cooper , FreeBSD-Stable ML , Warner Losh From: "Andrey V. Elsukov" X-Enigmail-Draft-Status: N1110 Message-ID: <566FF870.7030106@FreeBSD.org> Date: Tue, 15 Dec 2015 14:24:32 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20151214165858.GA76268@jarvis.whl> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QxSqtbGrVJMiipkobPmLMgSxmsNgVhVnK" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 11:25:08 -0000 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--