From nobody Thu Jul 13 20:31:34 2023 X-Original-To: dev-commits-src-main@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 4R25qW1bnNz4n7jQ; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R25qW18vkz3QBF; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689280295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyL2W7Zes+AFH3EkfStfHPr+1AGC8Bb0/m2QHjgYF9k=; b=BTQmxJQjyaBL7Zv9jJXTlLTNJ2LWyXtkAaszCtwNNZv8yFIzmmKsK3HplOFobHkr3NwrRf O82AGeP97BxzjwG5fHmaLdCCWgFon/lptvXSdxQwUSs8elxGkAaC+pX9pVWnEKha3GlG3G 9X6O0HG0vM1KfnKxVnN449cn4lZe7AatCqvWUIQAz/drQYIUfO+bkNtMT+IAitvGgDRWV1 lvcpXYMm0gmxSdL3UTcupMPO6m9cRJswgPmyKc06CbWS50ZqHLjcg+cxGRj70nw2btaWfD nD/X31NB49UV5IvvccADdpZFjplZvMS6cUI+ccxNJWIatYuULNaFNKHIkhBWIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689280295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyL2W7Zes+AFH3EkfStfHPr+1AGC8Bb0/m2QHjgYF9k=; b=Ztx7QsJYBFJuM/kkaW6rTeMYCLUaJLtI6ZueZcmw6K+vllQzyc0qryvaoSjxvYBh/xZ65m XttTjIIMKVoDNk5xJP41JkBy43WzPU3HpoIy/jf11hjtDHVRQYUj9hX9x8KDHZLvbabODJ bDcbjeTfQplj/EedW1okrn5LhaqeFWtudrkJGWXC6dsfQVzSlaOME8qXMdx4OLKsSbp+RI 2LSe19LGB/6YS9eQ/0/oFZ/nB7ufA3l4MgOb3DlN+fI4e4SyHn6Vn6H4R2NRm8m55x5+F9 +V9LHZW2xaBE4g9CFI/BK5dBczOy5RRW6v6rIyUecrG61gOnYTZFrENB+jz5Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689280295; a=rsa-sha256; cv=none; b=lLKXKZuhLDoRniyCODbM8eLZWpXj72nwVdyi5k4Rmw5ITTCsDeiWdPFKppjDkQ90v/76Gk AyN9lvdFxCm7wBrANxXCWwe3pV9PlxynldlGSTzX4LcIk9nu3TXqAdgP+wkuuFk95bO6+9 gGc2pN2xITd4NbnIToAA+xkEhxKfzSVbVyCrB9YKxFg/4Gl+G4Z3k96sPY5aAq/FyOM4Pd ZEJfgt0OEZlVFs8KOSxwd6RxQjYgw6YVtLdUlPuqsZEuhqJOusvEqJm9tZwygNVDtX7xUE U9571U5eXzVt5FwYcftVQt+X2lkq4ufrUM9qkfvQswVIBSFnD+nJ0SUhX8Yo+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R25qW0Ds5z155s; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DKVYpV019477; Thu, 13 Jul 2023 20:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DKVYIK019476; Thu, 13 Jul 2023 20:31:34 GMT (envelope-from git) Date: Thu, 13 Jul 2023 20:31:34 GMT Message-Id: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: be78a31188c5 - main - tcp: fix build issue for some cc modules List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be78a31188c530c93700396ecfdb5604a8f22fff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff commit be78a31188c530c93700396ecfdb5604a8f22fff Author: Michael Tuexen AuthorDate: 2023-07-13 16:56:25 +0000 Commit: Michael Tuexen 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