Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2026 16:55:04 +0000
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Kyle Evans <kevans@FreeBSD.org>
Subject:   git: aafcea441a3a - stable/15 - makeman.lua: catch up to REQUIRED_OPTIONS change
Message-ID:  <69f38968.236af.563d4057@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=aafcea441a3a8ef85f4ad01dddba79f11fcd2dbd

commit aafcea441a3a8ef85f4ad01dddba79f11fcd2dbd
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2026-04-22 02:29:07 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-04-30 16:27:55 +0000

    makeman.lua: catch up to REQUIRED_OPTIONS change
    
    161f8edc651c7 ("bsd.mkopt.mk: Prepare a list of all build options")
    restructured things and now we should simply strip the leading double
    underbar.  This fixes the oddity noticed in
    4ed20e0236dd0 ("kshim/usb: Add build option."), where WITH_CASPER made
    a surprise appearance.
    
    This is a part of D56558, but not the meat of the change.
    
    Reviewed by:    emaste, imp
    
    (cherry picked from commit 8bbba9f681ecccc6f6adcdb820c28df71f028e37)
---
 tools/build/options/makeman.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/options/makeman.lua b/tools/build/options/makeman.lua
index 7ce919f7a8de..af641ff6d638 100644
--- a/tools/build/options/makeman.lua
+++ b/tools/build/options/makeman.lua
@@ -309,7 +309,7 @@ end
 
 local function required_options()
 	local output = run_make({"-f", "share/mk/src.opts.mk", "-V",
-	    "__REQUIRED_OPTIONS"})
+	    "REQUIRED_OPTIONS"})
 	local options = {}
 
 	for opt in output:gmatch("[^%s]+") do


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f38968.236af.563d4057>