From nobody Tue Jun 20 00:23:28 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 4QlS685TY2z4f06S; Tue, 20 Jun 2023 00:23:28 +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 4QlS683hfLz4Hfb; Tue, 20 Jun 2023 00:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220608; 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=LZ83Q3vbsg1WOB+snuaRK643mnx3c0HIiGQW5n6cxn8=; b=b9V7E13C/fvLtXscq1goTTzZiOwCpz+/eHv/SBy50s+GCz6fCb58YYeobko75UbS+kQuJg JtvuBWIG3Ui/S+7gaKeyxKe1e0d6pd0f/S4sgyie4wboi4bpshK6pOObMibc61T9NBK95Q e/I7G+a/M+gDI6BwofopgASSsJZaDv0mzx0UckXJVqPrK4WPv5817IgpfuBRHTQbmk+Lxn QNN3A+KRhptkCADvUmpwrglWO+4C+x1lJJbDEB411eth/nWPu1AU9HpHZMIx0rKwUzEgb6 TH67kZ4NeLtAKgwMsqsU0B1NXZP9Ir2hoHmKblGPmVxuk8CkRBWaBAIg6u7BVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220608; 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=LZ83Q3vbsg1WOB+snuaRK643mnx3c0HIiGQW5n6cxn8=; b=JeEi0hr5UUcJw8cPQtch3H4fPazdK6nBl177Jj3x7NJ09i3gZ+IU9rNILqNrJTxzlYvlyf KgjJJhng75MyFrJYI+XvmyOuW0oE1iJeH2FoG5U1h2E+Gl5ytasYE7jp+A984QSSCTK3Gi 7xsS74TtG1ZD42+fz8xaL/iEzCxgV0gJ1PC3ZWQ3Cw9lOQQmIVBZLyX3vToatBs8JUiiAW gx0VuzYTC+HPayvwf+IiJxnUwGPxn00LDc6OzKgsnc9QCxhY7XWCV4IN0GbQFPZoOvDPQI CqDpENtgOR+tIlkl+xjU7UoMP/HcCyXnGShn6a8xwRjbxvMk00/ttFZweye8ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220608; a=rsa-sha256; cv=none; b=hk+aAMj9qvdPvznY2Bac9eKC1fl9A1KKp6HrIvlX8Q0lCSTKwCTm53BbTSYK2ASRGBPA7G Ix0/pnnyCW4URnW42URdDgewfAo9+IojcmnPaEYtnVjVU4SzMJYAm2JTuatJQo2dZQ2YKm ivqXginxFS31+QRURpnpNso8gffuQoGX621q4a2fKTwTQxRMeyyLG50rYKfpENFr9ZkICg psZyd2hrXjUGYf2iNtjOTH46zoQZMNKeum/OC9DX0g4CdtScBWmXzBcmXo/2S7b2zMIwFU 8b6D4Z/GWKhLbwbwNTDNPFUmlAfOSHaRNdR1jQI9BsYRrLRRfLzedaeAsHNyVA== 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 4QlS682n41zdfC; Tue, 20 Jun 2023 00:23:28 +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 35K0NSPw057480; Tue, 20 Jun 2023 00:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NSlA057479; Tue, 20 Jun 2023 00:23:28 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:28 GMT Message-Id: <202306200023.35K0NSlA057479@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: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b908f6c45e0202deb86fc9bde1b07212924c05fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b908f6c45e0202deb86fc9bde1b07212924c05fc commit b908f6c45e0202deb86fc9bde1b07212924c05fc Author: Colin Percival AuthorDate: 2023-06-17 20:08:37 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 bsd.mkopt.mk: Add REQUIRED_OPTIONS list Options on this list will be forced to 'yes'. This is intended for use as a transitional measure when an option is ceasing to be optional, before all of the associated make logic is removed. Differential Revision: https://reviews.freebsd.org/D40590 --- share/mk/bsd.mkopt.mk | 10 ++++++++++ share/mk/src.opts.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk index 3c6675b402cc..33eed9c8bce6 100644 --- a/share/mk/bsd.mkopt.mk +++ b/share/mk/bsd.mkopt.mk @@ -8,6 +8,8 @@ # "yes", unless WITHOUT_FOO is defined, in which case it is set to # "no". # +# For each option FOO in __REQUIRED_OPTIONS, MK_FOO is set to "yes". +# # For each option FOO in __DEFAULT_NO_OPTIONS, MK_FOO is set to "no", # unless WITH_FOO is defined, in which case it is set to "yes". # @@ -52,6 +54,14 @@ MK_${var}:= yes .endfor .undef __DEFAULT_YES_OPTIONS +# +# MK_* options which are always yes, typically as a transitional +# step towards removing the options entirely. +# +.for var in ${__REQUIRED_OPTIONS} +MK_${var}:= yes +.endfor + # # MK_* options which default to "no". # diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7b67a55f34b4..8120e23cb28b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -53,6 +53,9 @@ ____: # BROKEN was selected as the least imperfect one considered at the # time. Options are added to BROKEN_OPTIONS list on a per-arch basis. # At this time, there's no provision for mutually incompatible options. +# Options listed in 'REQUIRED_OPTIONS' will be hard-wired to 'yes'; this +# is intended as a transitional measure while options are in the process +# of being removed. __DEFAULT_YES_OPTIONS = \ ACCT \ @@ -213,6 +216,8 @@ __DEFAULT_NO_OPTIONS = \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ +__REQUIRED_OPTIONS = \ + # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. __DEFAULT_DEPENDENT_OPTIONS= \