Date: Fri, 14 Jul 2023 13:39:32 +0200 From: Kristof Provost <kp@FreeBSD.org> To: tuexen@freebsd.org Cc: Konstantin Belousov <kostikbel@gmail.com>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Message-ID: <00949E97-1098-4FC4-B5FB-9F639E93C81D@FreeBSD.org> In-Reply-To: <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> <ZLEwLRprzR0gSBmH@kib.kiev.ua> <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 14 Jul 2023, at 13:28, tuexen@freebsd.org wrote: >> On 14. Jul 2023, at 13:23, Konstantin Belousov <kostikbel@gmail.com> >> wrote: >> >> On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: >>> The branch main has been updated by tuexen: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff >>> >>> commit be78a31188c530c93700396ecfdb5604a8f22fff >>> Author: Michael Tuexen <tuexen@FreeBSD.org> >>> AuthorDate: 2023-07-13 16:56:25 +0000 >>> Commit: Michael Tuexen <tuexen@FreeBSD.org> >>> CommitDate: 2023-07-13 16:56:25 +0000 >>> >>> tcp: fix build issue for some cc modules >>> >>> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in >>> https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523 >>> The corresponding changes in two Makefiles were missed, which >>> resulted >>> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. >>> >>> Reported by: void@f-m.fm >>> Reviewed by: rrs, rscheff >>> Sponsored by: Netflix, Inc. >>> Differential Revision: https://reviews.freebsd.org/D41010 >>> --- >>> sys/modules/cc/Makefile | 6 +++--- >>> sys/modules/khelp/Makefile | 6 +++--- >>> 2 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile >>> index 3f7110024722..b595cc204481 100644 >>> --- a/sys/modules/cc/Makefile >>> +++ b/sys/modules/cc/Makefile >>> @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \ >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point >>> in >>> # building these modules by default. >>> -# We will default to building these modules unless $OPT_INET is >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" >>> +# We will default to building these modules if $OPT_GLOBAL does >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != >>> "" >>> SUBDIR+= \ >>> cc_cdg \ >>> cc_chd \ >>> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile >>> index 256d8838c573..c01d61541062 100644 >>> --- a/sys/modules/khelp/Makefile >>> +++ b/sys/modules/khelp/Makefile >>> @@ -4,9 +4,9 @@ SUBDIR= >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point >>> in >>> # building this modules by default. >>> -# We will default to building this module unless $OPT_INET is >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" >>> +# We will default to building this module if $OPT_GLOBAL does >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != >>> "" >>> SUBDIR+= h_ertt >>> .endif >>> >> It seems modules are actually broken for some configurations. > Some problems are known and being worked on. > > Could you share your kernel conf file and tell us, in which directory > you are running the make command? > `make buildkernel KERNCONF=MINIMAL` will fail (on amd64). Best regards, Kristof [-- Attachment #2 --] <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8"> </head> <body><div style="font-family: sans-serif;"><div class="markdown" style="white-space: normal;"> <p dir="auto">On 14 Jul 2023, at 13:28, <a href="mailto:tuexen@freebsd.org">tuexen@freebsd.org</a> wrote:</p> </div><div class="plaintext" style="white-space: normal;"><blockquote style="margin: 0 0 5px; padding-left: 5px; border-left: 2px solid #136BCE; color: #136BCE;"><blockquote style="margin: 0 0 5px; padding-left: 5px; border-left: 2px solid #136BCE; border-left-color: #4B89CF; color: #4B89CF;"><p dir="auto">On 14. Jul 2023, at 13:23, Konstantin Belousov <kostikbel@gmail.com> wrote:</p> <p dir="auto">On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote:</p> <blockquote style="margin: 0 0 5px; padding-left: 5px; border-left: 2px solid #136BCE; border-left-color: #4B89CF; color: #4B89CF;"><p dir="auto">The branch main has been updated by tuexen:</p> <p dir="auto">URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff">https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff</a></p>; <p dir="auto">commit be78a31188c530c93700396ecfdb5604a8f22fff <br> Author: Michael Tuexen <tuexen@FreeBSD.org> <br> AuthorDate: 2023-07-13 16:56:25 +0000 <br> Commit: Michael Tuexen <tuexen@FreeBSD.org> <br> CommitDate: 2023-07-13 16:56:25 +0000</p> <p dir="auto"> tcp: fix build issue for some cc modules</p> <p dir="auto"> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in <br> <a href="https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523">https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523</a>; <br> The corresponding changes in two Makefiles were missed, which resulted <br> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore.</p> <p dir="auto"> Reported by: void@f-m.fm <br> Reviewed by: rrs, rscheff <br> Sponsored by: Netflix, Inc. <br> Differential Revision: <a href="https://reviews.freebsd.org/D41010">https://reviews.freebsd.org/D41010</a>; <br> --- <br> sys/modules/cc/Makefile | 6 +++--- <br> sys/modules/khelp/Makefile | 6 +++--- <br> 2 files changed, 6 insertions(+), 6 deletions(-)</p> <p dir="auto">diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile <br> index 3f7110024722..b595cc204481 100644 <br> --- a/sys/modules/cc/Makefile <br> +++ b/sys/modules/cc/Makefile <br> @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \</p> <p dir="auto"># Do we have the TCP_HHOOK symbol defined? If not, there is no point in <br> # building these modules by default. <br> -# We will default to building these modules unless $OPT_INET is defined <br> -# and does not contain the TCP_HHOOK option. <br> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" <br> +# We will default to building these modules if $OPT_GLOBAL does contain <br> +# the TCP_HHOOK option. <br> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" <br> SUBDIR+= \ <br> cc_cdg \ <br> cc_chd \ <br> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile <br> index 256d8838c573..c01d61541062 100644 <br> --- a/sys/modules/khelp/Makefile <br> +++ b/sys/modules/khelp/Makefile <br> @@ -4,9 +4,9 @@ SUBDIR=</p> <p dir="auto"># Do we have the TCP_HHOOK symbol defined? If not, there is no point in <br> # building this modules by default. <br> -# We will default to building this module unless $OPT_INET is defined <br> -# and does not contain the TCP_HHOOK option. <br> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" <br> +# We will default to building this module if $OPT_GLOBAL does contain <br> +# the TCP_HHOOK option. <br> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" <br> SUBDIR+= h_ertt <br> .endif</p> </blockquote><p dir="auto">It seems modules are actually broken for some configurations.</p> </blockquote><p dir="auto">Some problems are known and being worked on.</p> <p dir="auto">Could you share your kernel conf file and tell us, in which directory <br> you are running the make command?</p> <br></blockquote></div> <div class="markdown" style="white-space: normal;"> <p dir="auto"><code style="padding: 0 0.25em; background-color: #E4E4E4;">make buildkernel KERNCONF=MINIMAL</code> will fail (on amd64).</p> <p dir="auto">Best regards,<br> Kristof</p> </div> </div> </body> </html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?00949E97-1098-4FC4-B5FB-9F639E93C81D>