From nobody Sat May 13 00:42:45 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 4QJ6Kx69kDz4BfMy; Sat, 13 May 2023 00:42:45 +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 4QJ6Kx5F3Mz3s4l; Sat, 13 May 2023 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683938565; 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=yBMzJCz5njz3Zf0r6GVQnZWF/8xU2cw+gGAyQqvyCQQ=; b=F6qT4OmJEilbV3ozcotPQXW8dBf6gRngBEAhbDtTXX0VabZNCNEf8fmnvpkNEW1xTsWW/f 4xSWJfdw865028E3Cq6E+8AvHr40U7IcokSa/jh9I6T/4tJCzoMy0UDrDc0n1aml2xdU9T IAA2mbbDAW1B/CjWvDJT2ToO1KNdc519rzxqhxVhRi3xPadX9j5wk8Rpu6DEuGl3gyZJ3p JfbaDSf47zVx2SGqoqwNKIhNnLoxXjT2cAii977ECN6ikQOd0Iu9u73ULIMJKKqcAXG5sI SsWv5xQFMahHsz3cgGIKBN2mhiAujB7Xy3W8H5XpZil27TEN8xSF3ao7qif5hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683938565; 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=yBMzJCz5njz3Zf0r6GVQnZWF/8xU2cw+gGAyQqvyCQQ=; b=oBae/Clj+Nhtv8fShlZ/eM7GKYshhGe28BKMs7ZqXciVObIUTSj6+HrO9PwuapD0YDPCv9 DcvmD3GTIUDUMH8X8JPXjv61ITxYYk8SGj+Ct1aKLxBirxuYmq5tryv/kCr8mDry9PXHNi O383CJmnIyZRpuTDKLlcPwX9LicpKHPi+kywkQ8JS7DyX4h5TN0SB81w8UIOuN9GzqnU2S RpNrx2ZuLEh1sBL5o/qvARgEfHaKJA73mmpXWCM6AEeWsRZbsQe2We+1F36JPlt3/8JTHq Lci5EbQ47Hhh7G0B9W2K5ZVgJ4S0XNWz7Ll9uDCmw36Z5mY+h1fdpj7xghsa8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683938565; a=rsa-sha256; cv=none; b=E5t/6pmPjjjFFOvH8QK27IXD752zbjHYfQiu8D+X3/lduTsQYV2hRRZ7v7upyUDMHsnpkt aKmKd/V5purTN+pbB9N4YnW7vyNAGYXK+OiyVa2860broX5HP8wym2we2bAVveVzB9TOsN cJS8ORYvkMcBuwpWNH71HVkqxmTkwAnDTJ+FoU70WSJ7V//VApUnD7X3LGJYr4qskbrAZ3 WuPfvln52tLrSpB8nGMB4E+zj89Na7fIjEVa/2wd+YZYf/vjCQi/uOtJHX72NtW0dVV8oe CE+XpEScuu2uv85bWn59QJmQ76JvK5L9TRNapw4LX5X6S02+z82tT4sapUavQQ== 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 4QJ6Kx4HQTzwbQ; Sat, 13 May 2023 00:42:45 +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 34D0gjn4050930; Sat, 13 May 2023 00:42:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0gjq4050929; Sat, 13 May 2023 00:42:45 GMT (envelope-from git) Date: Sat, 13 May 2023 00:42:45 GMT Message-Id: <202305130042.34D0gjq4050929@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: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1c8420702b7ad118ca909e9f7f39af8a6358e73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c8420702b7ad118ca909e9f7f39af8a6358e73 commit d1c8420702b7ad118ca909e9f7f39af8a6358e73 Author: Simon J. Gerraty AuthorDate: 2023-05-13 00:40:37 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 00:40:37 +0000 Move more DIRDEPS_BUILD settings local.meta.sys.env.mk should now concern itself only with META_MODE. Move any DIRDEPS_BUILD settings to local.sys.dirdeps.env.mk --- share/mk/local.meta.sys.env.mk | 66 --------------------------------------- share/mk/local.sys.dirdeps.env.mk | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.mk index f109da4f39dd..c0b17cec8f7e 100644 --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -1,68 +1,9 @@ # $FreeBSD$ # local configuration specific to meta mode -# before we process TARGET_SPEC -# we assume that MK_DIRDEPS_BUILD=yes - -# from src/Makefile (for universe) -TARGET_ARCHES_arm?= arm armv6 armv7 -TARGET_ARCHES_arm64?= aarch64 -TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?= riscv64 - -# some corner cases -BOOT_MACHINE_DIR.amd64 = boot/i386 -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]} -BOOT_MACHINE_DIR.$m ?= boot/$m -.endfor - -.if empty(MACHINE_ARCH) -.if !empty(TARGET_ARCH) -MACHINE_ARCH= ${TARGET_ARCH} -.else -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} -.endif -.endif -MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} -MACHINE_ARCH:= ${MACHINE_ARCH} - -HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} - -.if ${REQUESTED_MACHINE:U${MACHINE}} == "host" -MACHINE= host -.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} -# not what we want -TARGET_MACHINE= host -.endif -.endif -.if ${MACHINE} == "host" -OBJTOP := ${HOST_OBJTOP} -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} -.endif - -.if ${.MAKE.LEVEL} == 0 || empty(PYTHON) -PYTHON ?= /usr/local/bin/python -.export PYTHON -# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to avoid -# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avoid -# problems. -.if ${MK_DIRDEPS_BUILD} == "yes" && ${.MAKE.LEVEL} == 0 -.MAIN: dirdeps -.if make(all) -.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. -.endif -.endif -.endif - .if !defined(NO_META_MISSING) META_MODE+= missing-meta=yes .endif @@ -78,10 +19,3 @@ META_MODE+= missing-filemon=yes # this does not need/want filemon UPDATE_DEPENDFILE= NO .endif - -.if ${MK_DIRDEPS_BUILD} == "yes" -.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} -# a pseudo option to indicate we need libegacy for host -MK_host_egacy= yes -.endif -.endif diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk index ab22f4c9e7d9..3d45719ff292 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -12,3 +12,69 @@ TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ ${.MAKE.DEPENDFILE_PREFIX} +# before we process TARGET_SPEC +# we assume that MK_DIRDEPS_BUILD=yes + +# from src/Makefile (for universe) +# would be nice to have this sort of info in sys.machine.mk +TARGET_ARCHES_arm?= armv6 armv7 +TARGET_ARCHES_arm64?= aarch64 +TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe +TARGET_ARCHES_riscv?= riscv64 + +# some corner cases +BOOT_MACHINE_DIR.amd64 = boot/i386 +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]} +BOOT_MACHINE_DIR.$m ?= boot/$m +.endfor + +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH= ${TARGET_ARCH} +.else +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:= ${MACHINE_ARCH} + +HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} + +.if ${REQUESTED_MACHINE:U${MACHINE}} == "host" +MACHINE= host +.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} +# not what we want +TARGET_MACHINE= host +.endif +.endif +.if ${MACHINE} == "host" +OBJTOP := ${HOST_OBJTOP} +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif + + +.if ${.MAKE.LEVEL} == 0 || empty(PYTHON) +PYTHON ?= /usr/local/bin/python +.export PYTHON + +# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to avoid +# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avoid +# problems. +.if make(all) +.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. +.endif +.endif + +.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} +# a pseudo option to indicate we need libegacy for host +MK_host_egacy= yes +.endif