From nobody Wed Dec 07 19:31:14 2022 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 4NS6pV6z2qz4jdKx; Wed, 7 Dec 2022 19:31:14 +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 4NS6pV6WjGz3KWc; Wed, 7 Dec 2022 19:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670441474; 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=Mn7ecSwwf1+uI03vlFc3+o/xFByLCkAkddSInnYkN8c=; b=B7JTQ8fWDYp3ohccMs6Y1epV9ja/YptoIjYDSyCSXga5DJGwYixLpaikrrp6Q7D9zh+JUz atJRKtp3/xXaxWwuuGIGZHAHsz0wuKYfA1ngQeXDWsulNTiiNJcyg6DwjsexL05/CW03q/ v5wR/5FApflWf0Autqt0Y8wW4mcXxMXr174z8aMy4cpwQAZFpFb+NWwFWzGH8pMaV2a8Nw dVaQbbxWu6CAur4v/Pk2aLcNqiIVwfSdlIpomh4QFyclZhsprztaRZj4pfv3tht6OlRISk 2xNM2AtOPN60vCl2LjRWT2Zm0OWixZtKJDg5OfJVCdPKvpOwOwVxw5zY4WR36Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670441474; 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=Mn7ecSwwf1+uI03vlFc3+o/xFByLCkAkddSInnYkN8c=; b=OVDmGrL5SOaAdyuvBDJlq+kbsjZanuDNPxJX6QVJQX3sZT6mh7XllpyzF+lwup/1pE8FVH dkYNVGYWCDhtLOOQwtX9d4Nr5VPoESI5DO+vPT4+Bc4I62/mqD24kkd2dqSaJ5ozSz2DaM Hk4XORtszWgEpJVefwA0/UTsqwjdoeMRt8ymDxQN+2QiwvLjHjQuX0DTGOJo8vvqcuqZhb ElOkLoOgZImxM/0TKBRtytlrcVSuBNBSWlCnRlNWrXvYOxzoXT0PL4YRY3XieZatQbdBPJ 5ZR4rPR1iUewMiHMVOCZk+riD4RxwZ/zE5lw+rOGft6mqLllTgkAaw76enkybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670441474; a=rsa-sha256; cv=none; b=cgyl1tKCyRlQEEO2E64aud3neVLGI5/WtFxx6LeHaKjh8Tf4HQ1jbCSsMW6ZzXTuUcnJX2 sn6Xue40m0w1h7ha0E7i8M66Js3hN+sAxeulL4Q8IWrBSPDROM/07IrHGrhSMMHTT6JpHx GLjMZGoUjUpbflI8d16GaYC5fRDT0KZqoevbNvsZ3w6RzTy4k7/A0fKwdO85aFb4H1wtAi DfsBrMjDaUHBAWCaAn0bCC0fU1ftudNrtx5i9q4J04uSMjOPlBcfh6kn9PvM2/voBwT8m1 cvfqBaU9VxwmXJ+zzj5i9uQi0DKj5KE6KgHnNtG8quUmk6CLxkKK3BtVUryWWw== 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 4NS6pV5b9TzSDW; Wed, 7 Dec 2022 19:31:14 +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 2B7JVEMu097607; Wed, 7 Dec 2022 19:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7JVENF097606; Wed, 7 Dec 2022 19:31:14 GMT (envelope-from git) Date: Wed, 7 Dec 2022 19:31:14 GMT Message-Id: <202212071931.2B7JVENF097606@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: 073ccb9d5553 - main - Allow site.*.mk to augment local.*.mk and src.*.mk 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: 073ccb9d5553684590ef1ba4de3d5af77a53ee94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=073ccb9d5553684590ef1ba4de3d5af77a53ee94 commit 073ccb9d5553684590ef1ba4de3d5af77a53ee94 Author: Simon J. Gerraty AuthorDate: 2022-12-07 19:30:35 +0000 Commit: Simon J. Gerraty CommitDate: 2022-12-07 19:30:35 +0000 Allow site.*.mk to augment local.*.mk and src.*.mk Add some extra customization points so that FreeBSD build can be adapted to local requirements. We use these to minimize changes to share/mk Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37617 --- share/mk/local.dirdeps-options.mk | 2 +- share/mk/local.dirdeps.mk | 2 ++ share/mk/local.init.mk | 1 + share/mk/local.meta.sys.mk | 3 +++ share/mk/local.sys.env.mk | 1 + share/mk/local.sys.mk | 1 + share/mk/src.libnames.mk | 2 ++ share/mk/src.opts.mk | 2 ++ share/mk/src.sys.env.mk | 4 +++- 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk index 9ad08a78cb19..87af1604c4e4 100644 --- a/share/mk/local.dirdeps-options.mk +++ b/share/mk/local.dirdeps-options.mk @@ -25,4 +25,4 @@ DIRDEPS.OPENSSL.no+= lib/libmd DIRDEPS.PAM_SUPPORT.yes+= lib/libpam/libpam DIRDEPS.TCP_WRAPPERS.yes+= lib/libwrap - +.-include diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 16c9ee5a55ec..d7e5396c81ed 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -217,3 +217,5 @@ CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} BOOT_MACHINE_DIR:= ${BOOT_MACHINE_DIR.${DEP_MACHINE}} KERNEL_NAME:= ${KERNEL_NAME.${DEP_MACHINE}} + +.-include diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk index 29a951a6aac0..c8072004697f 100644 --- a/share/mk/local.init.mk +++ b/share/mk/local.init.mk @@ -36,5 +36,6 @@ CFLAGS+= ${HOST_CFLAGS} .endif .-include "src.init.mk" +.-include .-include "${.CURDIR}/local.init.mk" .endif diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index 075a84fb67de..fc28b83d82cc 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -25,6 +25,9 @@ MACHINE_ARCH.host = ${_HOST_ARCH} # the list of machines we support ALL_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv + +.-include + .for m in ${ALL_MACHINE_LIST:O:u} MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index 2187104e83fa..e3348537db41 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -49,3 +49,4 @@ ECHO_TRACE?= true .endif .include "src.sys.env.mk" +.-include diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index a4b7b0561f15..519c72df2383 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -52,6 +52,7 @@ _PREMK_LIBDIR:= ${LIBDIR} .endif .include "src.sys.mk" +.-include .if ${.MAKE.MODE:Mmeta*} != "" # we can afford to use cookies to prevent some targets diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 59b7630bcf55..db7c86651f96 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -756,6 +756,8 @@ LIBLNDIR= ${_LIB_OBJTOP}/usr.bin/lex/lib LIBTERMCAPWDIR= ${LIBTINFOWDIR} +.-include + # Default other library directories to lib/libNAME. .for lib in ${_LIBRARIES} LIB${lib:tu}DIR?= ${OBJTOP}/lib/lib${lib} diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index adb6912daa7d..de36d672d20e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -242,6 +242,8 @@ __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 diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk index 86f739414230..e20bc52d2065 100644 --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -42,6 +42,8 @@ _undefMAKEOBJDIRPREFIX= t .endif .endif +.-include + SRC_ENV_CONF?= /etc/src-env.conf .if !empty(SRC_ENV_CONF) && !target(_src_env_conf_included_) .-include "${SRC_ENV_CONF}" @@ -89,6 +91,6 @@ MAKESYSPATH:= ${.PARSEDIR:tA} .endif .if ${RELDIR:U} == "." && ${.MAKE.LEVEL} == 0 -.sinclude "${.CURDIR}/Makefile.sys.inc" +.-include "${.CURDIR}/Makefile.sys.inc" .endif .include