From nobody Wed Dec 22 16:01:51 2021 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 562831909652 for ; Wed, 22 Dec 2021 16:01:54 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJykT4CNtz3CQ1 for ; Wed, 22 Dec 2021 16:01:53 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-wm1-x32a.google.com with SMTP id b186-20020a1c1bc3000000b00345734afe78so1788439wmb.0 for ; Wed, 22 Dec 2021 08:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=PnTa5bURcay1PlyHdMOUPLwt2I8Sq/nTyRFDRu1N+e8=; b=ddq61h1mnkWPAxOdwIpFI9BZ9ZQ6+n7n9WfH6kC6wm0ecxvZdYzm7rNsWzPu8HwrHX WDIgIIcYqtbOr48twjmKhjF4nK6jC8jWECgGcF8XlkpnjPBqsAGykaDp4AaOoOCQa6ZV ZTOF4+TwWDF2y7P5Pg4lSdp7vygqmts4jGxLruVdgoi5jxu9vI6umepOpmK7Xicy/1iX W2t2/LkMVvNBNN7ba+cFMV4RDUZePhiYdg1jEKpiD9oVFzHeLphVnpdGU4c/eMJErzN+ LHEmxw+2WQx4dyK/Hg5p90s2MZtkDq8kONkITOR32pMq4Mzi7UxseH7Nm1jaYlviKEt2 dEqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=PnTa5bURcay1PlyHdMOUPLwt2I8Sq/nTyRFDRu1N+e8=; b=cSPMJP38Ti1mk8cvXqj6tmyuvQZUJ5esHD0ubomFpoqF6RsW1COSWzbwnn1ouMUcBe +vpOYsuB7GaE04QnmZfRCt2Hv4sunGWv/RsWHYB0V349FqqwMoMmQeaafv2hvEfWBh5y tIKC1hzIekT7W4lbWnNbn4D20UHOmTel4JlBLfVLf9ptO+NlwDI4LFIAcP7UcbMcCMVh 3rtpHgZmQS8/Q1GBsqgRAtFmOSG2NJarG2SBlA3z9wuZ7yPaQGAlUY1QHmXPbUl0MgK2 PZqbJLZH5rrhEdDscHq5wlVskSqWbVOuoQzDtKWxB8qzcM8QbXPdv5x97ORFs73iSYz0 r4+A== X-Gm-Message-State: AOAM532Gh6P17wOyY7WRE9j+Q9OZheah7ykuVsjjfQ7SaXzDo+HMVHU1 iUMzPTY7l2hr0lpXmhloYsk6e/HvfD4= X-Google-Smtp-Source: ABdhPJwcJc0rMkmAZvNJ5NWBflc/ar+ZQros2HAWWlyIgAtqS5xmb6FTLSNUlkIOCtjtT/npXxh7Dw== X-Received: by 2002:a05:600c:1e05:: with SMTP id ay5mr1367796wmb.131.1640188912580; Wed, 22 Dec 2021 08:01:52 -0800 (PST) Received: from ernst.home (p5b3be0d9.dip0.t-ipconnect.de. [91.59.224.217]) by smtp.gmail.com with ESMTPSA id f13sm2395480wri.51.2021.12.22.08.01.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 08:01:52 -0800 (PST) Date: Wed, 22 Dec 2021 17:01:51 +0100 From: Gary Jennejohn To: freebsd-current@freebsd.org Subject: Re: WITHOUT_PF breaks buildworld Message-ID: <20211222170151.05a4afe3@ernst.home> In-Reply-To: <20211222165154.33ef54fd@ernst.home> References: <20211219114723.338b235e@ernst.home> <61bf1204.1c69fb81.2c8fc.3280SMTPIN_ADDED_BROKEN@mx.google.com> <20211219122443.1c84093f@ernst.home> <74FC7625-295C-4DEC-BF35-434B5F8D7832@FreeBSD.org> <20211222165154.33ef54fd@ernst.home> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4JJykT4CNtz3CQ1 X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=ddq61h1m; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gljennjohn@gmail.com designates 2a00:1450:4864:20::32a as permitted sender) smtp.mailfrom=gljennjohn@gmail.com X-Spamd-Result: default: False [1.14 / 15.00]; HAS_REPLYTO(0.00)[gljennjohn@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RECEIVED_SPAMHAUS_PBL(0.00)[91.59.224.217:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.99)[0.994]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; FREEMAIL_REPLYTO(0.00)[gmail.com]; NEURAL_SPAM_MEDIUM(0.24)[0.244]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_SPAM_LONG(0.90)[0.897]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::32a:from]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On Wed, 22 Dec 2021 16:51:54 +0100 Gary Jennejohn wrote: On Wed, 22 Dec 2021 16:27:52 +0100 Kristof Provost wrote: > On 22 Dec 2021, at 8:21, Konrad Sewi??o-Jopek wrote: > > Hi, > > > > I think the reason is somewhere in tools/build/test-includes: > > > > --- net/if_pfsync.o --- > > In file included from net/if_pfsync.c:1: > > In file included from > > [...]freebsd/arm64.aarch64/tmp/usr/include/net/if_pfsync.h:56: > > [...]freebsd/arm64.aarch64/tmp/usr/include/net/pfvar.h:65:10: fatal error: > > 'netpfil/pf/pf.h' file not found > > #include > > ^~~~~~~~~~~~~~~~~ > > 1 error generated. > > *** [net/if_pfsync.o] Error code 1 > > > > make[3]: stopped in [...]freebsd/tools/build/test-includes > > --- net/pfvar.o --- > > > In file included from net/pfvar.c:1: > > > [...]freebsd/arm64.aarch64/tmp/usr/include/net/pfvar.h:65:10: fatal error: > > > 'netpfil/pf/pf.h' file not found > > > #include > > > ^~~~~~~~~~~~~~~~~ > > > 1 error generated. > > > *** [net/pfvar.o] Error code 1 > > > > > > make[3]: stopped in [...]freebsd/tools/build/test-includes > > > 2 errors > > > > > > make[3]: stopped in [...]freebsd/tools/build/test-includes > > > *** [test-includes] Error code 2 > > > > > > make[2]: stopped in [...]freebsd > > > 1 error > > > > > > Best regards, > > > Konrad Sewi??o-Jopek > > > > > > > > > niedz., 19 gru 2021 o 12:26 Gary Jennejohn > > > napisa?(a): > > > > > >> On Sun, 19 Dec 2021 19:05:35 +0800 > > >> Alastair Hogge wrote: > > >> > > >>> On Sunday, 19 December 2021 6:47:23 PM AWST Gary Jennejohn wrote: > > >>>> Some recent change, probably in a .mk file, breaks builworld on HEAD > > >>>> when WITHOUT_PF is enabled in src.conf. > > >>> > > >>> I have had to disable WITHOUT_PF since 2020-07-27, but probably earlier. > > >>> > > >> > > >> Hmm. I did a successful buildworld a few days ago with WITHOUT_PF > > >> enabled, so it's new breakge for me at least. > > >> > > >> I don't enable pf in the kernel and don't need it in userland. > > >> > > >>>> Disabling WITHOUT_PF results in a successful buildworld. > > >>>> > > >>>> The reported error is that netpfil/pf/pf.h can't be found. > > >>> > > >>> Some ports depend on that too. > > >>> > > >> > This is the test-includes target, which validates that include files are self-contained (that is, you can '#include <$file>' without prerequisites. > The target fails because it looks at all headers in /usr/src/sys and then tries to build them, but some of those headers (like the pf headers) include other headers that may not be getting installed because they're disabled. > > I'm not quite sure how to best fix this. > > Note that it is not happening because some pf tools are still getting built. This is a validation target that fails. > > We could potentially add the pf headers to BADHDRS depending on the WITHOUT_ flag, but that would mean manually maintaining badfiles.inc. > Or perhaps we should keep installing the pf headers even when WITHOUT_PF is set, but I'm not actually sure how we convince the build system to do that. Or if it's a good idea. > > Warner might have better ideas on how to fix this. > 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. -- Gary Jennejohn