Date: Mon, 14 Dec 2015 17:58:58 +0100 From: Mariusz Zaborski <oshogbo@FreeBSD.org> To: "Andrey V. Elsukov" <ae@FreeBSD.org> Cc: NGie Cooper <yanegomi@gmail.com>, 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: <20151214165858.GA76268@jarvis.whl> In-Reply-To: <566EF46A.8080704@FreeBSD.org> References: <CE7F6687-9D20-4804-896B-6F2AF39AECE7@gmail.com> <20151214165111.GA70582@jarvis.whl> <566EF46A.8080704@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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?
> >> 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 which
r277130 is fixing. :)
>
> --
> WBR, Andrey V. Elsukov
> Index: stable/10/sys/modules/if_gif/Makefile
> ===================================================================
> --- 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}/../../netinet6
>
> KMOD= if_gif
> -SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
> +SRCS= if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
>
> .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!= cat ${KERNBUILDDIR}/opt_inet.h; echo
> +.if empty(OPT_INET)
> +MK_INET_SUPPORT=no
> +.endif
> OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
> .if empty(OPT_INET6)
> MK_INET6_SUPPORT= no
> @@ -25,6 +26,10 @@ MK_INET6_SUPPORT= no
> .endif
> .endif
>
> +.if ${MK_INET_SUPPORT} != "no"
> +SRCS+= in_gif.c
> +.endif
> +
> .if ${MK_INET6_SUPPORT} != "no"
> SRCS+= in6_gif.c
> .endif
--
Mariusz Zaborski
oshogbo//vx | http://oshogbo.vexillium.org
FreeBSD commiter | https://freebsd.org
Software developer | http://wheelsystems.com
If it's not broken, let's fix it till it is!!1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151214165858.GA76268>