Date: Wed, 22 Dec 2021 12:52:15 -0600 From: Warner Losh <imp@bsdimp.com> To: Gary Jennejohn <gljennjohn@gmail.com> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: WITHOUT_PF breaks buildworld Message-ID: <CANCZdfrjfcMh_zDnVEqMQHWQ3nL0XkqkqE%2Bf_Nv1jfeCh2XPCA@mail.gmail.com> In-Reply-To: <20211222193725.19f2f03a@ernst.home> References: <20211219114723.338b235e@ernst.home> <61bf1204.1c69fb81.2c8fc.3280SMTPIN_ADDED_BROKEN@mx.google.com> <20211219122443.1c84093f@ernst.home> <CAGgez=%2B_jdDn6dfOeo%2BuBeeFNzBfD57HL4wUrw=X-BmGg7mPyg@mail.gmail.com> <74FC7625-295C-4DEC-BF35-434B5F8D7832@FreeBSD.org> <20211222165154.33ef54fd@ernst.home> <20211222170151.05a4afe3@ernst.home> <CANCZdfqAdO1HMDnWMsEU1LarRj36GzA%2Bog%2BxGkBY6rziA_yLWQ@mail.gmail.com> <20211222193725.19f2f03a@ernst.home>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000088923005d3c09f3e
Content-Type: text/plain; charset="UTF-8"
On Wed, Dec 22, 2021, 12:37 PM Gary Jennejohn <gljennjohn@gmail.com> wrote:
> On Wed, 22 Dec 2021 10:58:50 -0600
> Warner Losh <imp@bsdimp.com> wrote:
>
> > On Wed, Dec 22, 2021, 10:02 AM Gary Jennejohn <gljennjohn@gmail.com>
> wrote:
> >
> > >
> > > This simple patch to /usr/src/include/Makefile fixes it for me:
> > >
> > > --- Makefile.orig 2021-12-22 13:37:02.817745000 +0100
> > > +++ Makefile 2021-12-22 13:37:12.177336000 +0100
> > > @@ -246,9 +246,7 @@
> > > INCSGROUPS+= IPFILTER
> > > .endif
> > >
> > > -.if ${MK_PF} != "no"
> > > INCSGROUPS+= PF
> > > -.endif
> > >
> > > .if ${MK_CDDL} != "no"
> > > INCSGROUPS+= NVPAIR
> > >
> > > Since pf.h is used so widely in the tree it's probably the simplest
> fix.
> > >
> >
> > I like this. I'd unconditionally remove the test in preference to adding
> it
> > conditionally.
> >
>
> If I still had my commit bit I'd do it myself :-)
>
I can do it tonight. I'm on the road today dri ING back from Omaha..
Warner
--
> Gary Jennejohn
>
--00000000000088923005d3c09f3e
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" =
class=3D"gmail_attr">On Wed, Dec 22, 2021, 12:37 PM Gary Jennejohn <<a h=
ref=3D"mailto:gljennjohn@gmail.com">gljennjohn@gmail.com</a>> wrote:<br>=
</div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-l=
eft:1px #ccc solid;padding-left:1ex">On Wed, 22 Dec 2021 10:58:50 -0600<br>
Warner Losh <<a href=3D"mailto:imp@bsdimp.com" target=3D"_blank" rel=3D"=
noreferrer">imp@bsdimp.com</a>> wrote:<br>
<br>
> On Wed, Dec 22, 2021, 10:02 AM Gary Jennejohn <<a href=3D"mailto:gl=
jennjohn@gmail.com" target=3D"_blank" rel=3D"noreferrer">gljennjohn@gmail.c=
om</a>> wrote:<br>
> <br>
> ><br>
> > This simple patch to /usr/src/include/Makefile fixes it for me:<b=
r>
> ><br>
> > --- Makefile.orig=C2=A0 =C2=A0 =C2=A0 =C2=A02021-12-22 13:37:02.8=
17745000 +0100<br>
> > +++ Makefile=C2=A0 =C2=A0 2021-12-22 13:37:12.177336000 +0100<br>
> > @@ -246,9 +246,7 @@<br>
> >=C2=A0 INCSGROUPS+=3D=C2=A0 =C2=A0IPFILTER<br>
> >=C2=A0 .endif<br>
> ><br>
> > -.if ${MK_PF} !=3D "no"<br>
> >=C2=A0 INCSGROUPS+=3D=C2=A0 =C2=A0PF<br>
> > -.endif<br>
> ><br>
> >=C2=A0 .if ${MK_CDDL} !=3D "no"<br>
> >=C2=A0 INCSGROUPS+=3D=C2=A0 =C2=A0NVPAIR<br>
> ><br>
> > Since pf.h is used so widely in the tree it's probably the si=
mplest fix.<br>
> >=C2=A0 <br>
> <br>
> I like this. I'd unconditionally remove the test in preference to =
adding it<br>
> conditionally.<br>
> <br>
<br>
If I still had my commit bit I'd do it myself :-)<br></blockquote></div=
></div><div dir=3D"auto"><br></div><div dir=3D"auto">I can do it tonight.=
=C2=A0 I'm on the road today dri ING back from Omaha..</div><div dir=3D=
"auto"><br></div><div dir=3D"auto">Warner</div><div dir=3D"auto"><br></div>=
<div dir=3D"auto"><div class=3D"gmail_quote"><blockquote class=3D"gmail_quo=
te" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"=
>
-- <br>
Gary Jennejohn<br>
</blockquote></div></div></div>
--00000000000088923005d3c09f3e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrjfcMh_zDnVEqMQHWQ3nL0XkqkqE%2Bf_Nv1jfeCh2XPCA>