From nobody Tue Jun 20 00:23:29 2023 X-Original-To: dev-commits-src-all@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 4QlS695dwGz4f096; Tue, 20 Jun 2023 00:23:29 +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 4QlS694mrzz4HxQ; Tue, 20 Jun 2023 00:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220609; 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=KDpT6L0ZIuLvP8TTEbNyhTgXu8Crch7eAY5eATQxv94=; b=hNc+eFkL0NPs4gHZgcORneWFxJ0aMon01ko8ey+strBNaUSuvQ7CZpu6bRdtlmB3vuvcox iaNRTkeXIyVci+bKn06ztnOmJzm2D38cJulvWLfvcxhLNLZVZz/UUx06jbd0WF+rL4w3Rq zxS6EBkiB1Esg0Ch7KeRZBeKn8JFAOAMT7f7FYT56cYdwkUSVf/wLDWVoNRYp4dELZOzN3 sQtVX93c4eCOD3NMCtj8qAGJOCwx7XWQYu528hAiuROURMl67UqMZmZstATzejbgCuAH9/ BkfI+6QpqXMFwPgoIVlyE6l5LjTPBHk2xOLsBSXRTLYUGmNtd9PavRT/Ll0GrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220609; 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=KDpT6L0ZIuLvP8TTEbNyhTgXu8Crch7eAY5eATQxv94=; b=cz/tFdrlvMQKqGf0rZWM/CaJ7zrCg5V+VxIM653bRd2Mex9I0NL1e6qmw6CxfuSbOQuyhi OoQh1n5EswPX2ZvGWau00kH6819bEaMtf901OHKu/YG+202JFQoOmFFjYaz7C7a3OqE0of 8wUp/37eIqfvX0NKBxwMFeOi2Z0t8V8y1KS8eNkk9fFk8NrKAHLi+VMI+cG33a2SJD9Gwi mDQbt9dBkaLBOjo08cALvA2Pm/wUJ7ITbhJ1mfB+Al2h0vvtYo5C8XLaZAD0soT1V/Xugk 17vvuQZjtLJEndgogznRbVMBPQrLYW2uGtVDutZpKm1xWTO3uA9aCnkbQDvyUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220609; a=rsa-sha256; cv=none; b=e0Wqcb1foRFRF9DBxipvQf6wuZufIfegQNQPZ3FC0hF4SgZj0WFxs3Mi8DfdXI9gVX8MGp ZvFRPM2UHWnDq3sC6t4CL1nFhOzYJSvdjPXwqfqxBW0gBruw3BypCQ+wfXJHjAzgSYrmrn /TxTqCJ76qqg4F6iXSvh663wQFjcWmHBym7Y/R8gjgBtUctmUvEgEp1s609c/909OPejNb UGJ1uH/A/lE8o+OPfCXZhM7qSueBLgVOdRpXee6b4/8He3TPq2CgW9mVtaNA6ePQHtdWJa 4MSW/vovPVQKXS53vshBiwgZTLPQH7pLu8DejL3WDzHkf1Lf8X1BtAMBrvSfQg== 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 4QlS693T6SzdBg; Tue, 20 Jun 2023 00:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K0NTtc057499; Tue, 20 Jun 2023 00:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NTMm057498; Tue, 20 Jun 2023 00:23:29 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:29 GMT Message-Id: <202306200023.35K0NTMm057498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bce996791511 - main - options/makeman: Handle __REQUIRED_OPTIONS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce9967915115e00271b01f1698bfca30a9be1cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bce9967915115e00271b01f1698bfca30a9be1cc commit bce9967915115e00271b01f1698bfca30a9be1cc Author: Colin Percival AuthorDate: 2023-06-18 00:01:52 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 options/makeman: Handle __REQUIRED_OPTIONS Teach the code which generates src.conf.5 about __REQUIRED_OPTIONS; without this change it gets confused and thinks that every option turns the required options on. Reviewed by: sjg, imp Differential Revision: https://reviews.freebsd.org/D40591 --- tools/build/options/makeman | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 5a8b207b228a..68eeaf2a7a11 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -117,10 +117,17 @@ show() exit 1 ;; esac + requireds=`env -i make -f ${srcdir}/share/mk/src.opts.mk \ + -V '${__REQUIRED_OPTIONS:ts,}'` env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null | while read var _ val ; do opt=${var#MK_} + case ,${requireds}, in + *,${opt},*) + continue + ;; + esac case ${val} in yes) echo ${yes_prefix}_${opt}