From nobody Mon Apr 17 17:45:07 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 4Q0ZFc0SX0z44ySW; Mon, 17 Apr 2023 17:45:08 +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 4Q0ZFb6X9Xz4RN6; Mon, 17 Apr 2023 17:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681753507; 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=M3VKity4xsoE8I1jzScjLucCQSwydeq4lAyk+TEjFSc=; b=xFlcfz6OojaSWyrKBvhcjTdiAkFGdikG0C5UTRYBj3l4/XjAJl/ZRKCqauVGI4aoMBHkOk i9JlDrAVUgqU2OR2HpmgGyPGFccMkC8XKEtY9lkJNC/G2hISpOTm4dgaE12TzSPMqzr5Q8 a4i+ea3kLoihYNw/FWkv9ytWXgiex/x9D3227dgEUfw6Mz4s5aiCsc3gpOkGGEapy7489d sh7KZhW9vtXgLLbWuP76LFAOXr0kMIppDriSPJVMvLsqZgwYqMBztK3kTdpsAapJkCxrOY aPQduKV05r87nhpIScRA/S/KC2qADQSviWG+Zeq8XDfy/9ZmLt2PKQH1OH0PRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681753507; 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=M3VKity4xsoE8I1jzScjLucCQSwydeq4lAyk+TEjFSc=; b=hmUNsZY20SF1bTS1HoZzMQ2dK1YwI6VN3IiRfHs/Ig0+xdldZYpNSFtn3Wnar97gWieFyL IRooKNjU3fuqPh+T45nw0WQeVng/6NcdCsU3XLDvLOdkPgd2GrWl22LL+BneZScGSoQjiE fV8QwbaA84FXnohqlx6cGUr2N6qc398BDND2Uz6cks06sSYbNNduqI+xPQJNdFrQZQ8aFd lfODn1gulQRfjKhKqzyp3LXFbTFL05w1NmBC2hxicSm1ssPShyR7IhmW+vGg3VPGk/JBV3 SRbZckl45oZ16ONWHZFt1+vuk0DPPz3ofvjwLpKVFaaBM/IVJUNTF0ua+wdGdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681753507; a=rsa-sha256; cv=none; b=VwkS5EE7KOowXZmQQS5Qoq53yEUmqbyTIXixaCnRY9XkpfXKqSemDEPE5iQ3HHoX2xpmKw Idsrg4ZL/UK8WnEFLAk2gvU8mjD2hdkVJcOGls5CjjWpOKTxrTI2OivF+1GWLDKI3lvz8e aVfkgyhRCkTizeFMdwORqM2coUone52or5t9pgJZ4pSk+FvPhC+HMnInEQH8RkGOf3GDG6 k22ISlv/3XFUoktIdqOme4X+UilmXh0YwtLQCUQrRAaUCmEqBRY9VpEZ2Jj+WI/cfSrCWs 8OB1waTcrHFqyeOa1gqsgf7keau2txO8YHv8Wnjx0nHb+4IEi4Np3MhCcT/F9A== 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 4Q0ZFb5WMSzfCl; Mon, 17 Apr 2023 17:45:07 +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 33HHj7RD067776; Mon, 17 Apr 2023 17:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HHj71R067775; Mon, 17 Apr 2023 17:45:07 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:45:07 GMT Message-Id: <202304171745.33HHj71R067775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: c4c981c1e60b - main - Move include of site.src.opts.mk to allow more control 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4c981c1e60b72d25258739c635cacbc88fa1d4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c981c1e60b72d25258739c635cacbc88fa1d4c commit c4c981c1e60b72d25258739c635cacbc88fa1d4c Author: Simon J. Gerraty AuthorDate: 2023-04-17 17:44:37 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-17 17:44:37 +0000 Move include of site.src.opts.mk to allow more control Sometimes a site may have different policy needs, include site.src.opts.mk just before bsd.mkopt.mk to allow more control. Reviewed by: imp --- share/mk/src.opts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8032284d964e..f40f35e6e2d9 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -239,8 +239,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \ __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var} .endfor -.-include - # # Default behaviour of some options depends on the architecture. Unfortunately # this means that we have to test TARGET_ARCH (the buildworld case) as well @@ -365,6 +363,8 @@ __DEFAULT_NO_OPTIONS+=NETLINK __DEFAULT_NO_OPTIONS+=NETLINK_SUPPORT .endif +.-include + .include #