From nobody Sat May 13 01:12:57 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 4QJ70t4f91z4Bh7K; Sat, 13 May 2023 01:13:02 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJ70t3smBz3xPf; Sat, 13 May 2023 01:13:02 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683940382; 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: in-reply-to:in-reply-to:references:references; bh=It36FPVJPITX/ue+JYDAJ3pcmo2Zv7Ej98F1Dnr0QPA=; b=MpdfeTMAI2t6kCNm6lJ3koz/7GYjg4oWB0K9V0mi2gUTmq05hR3R92oFkHBQ05mWWPYIbH 67OL9yXkwJE5bS5y6v2r5g+D+GcOz6c4iKH1RlVLwYXkBepShpTToBjpUwbF0eL2oTrxqx Rfw/1esk9uujXG2Dsa5DBwvnkil6qttSHgI3KGieFrpe2AifIowD6+CaxWaclK9Ch6D7M9 cg7Ho2KcuIkwPkMA2jIpdyBR0nGiGUyY5wP6H/HqGPGAj3ZEk9rcTTjqCOOXYCfioM+E/3 LkRwTS4oMSXs+tLWk+KboGDnSxPwb+tujEhIu/+YgA4MBUQ6HCiZdbsNDIDO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683940382; 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: in-reply-to:in-reply-to:references:references; bh=It36FPVJPITX/ue+JYDAJ3pcmo2Zv7Ej98F1Dnr0QPA=; b=TwqcgOpdtnohGxL38ETxQMNnwnXz594bL6uiiFAe5uWw9SzMn2D0TgODNvdQTy0FEdxkaT 3wY2+g0GhU7XpcVpnxzsImJsrU2gPZCFMuMqP+vchmUl1RKG6qVsNlpJEJETW8VlsqWR3W QK7KceRKOrzBwKJi4H6togD8D5ILxnfb/KFlsBTQr9r7mxPRn0tmZklIu/v/Te8i2JcmqP 8oh6DWKrw99xvMzJ5gIcbS8eF0XNZRlgfRjXpnbB/3Uw6yYtLdffEgOX6Wqkjc+r134HeP FIY8YRk3pGREvoBqaQYgrKpALvHUI3Jl8DCGu4CgYNFzNuVt9YqyVzvam/CgTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683940382; a=rsa-sha256; cv=none; b=gJctqpw3IfCF8VUrft7quY58n26dk8jS2aXUIBd9J3+kACV0/ZGasdgB4v55FXLr2z3k3e 4AQfYkQOfPBMPxhFZ2ORMmIldNmLHhNpNF7VuQrg7gMDQ31InXHW0jWd++iyNWY5bHq/YR rVC2u9IjFZbPk/Bp4iB1juYmyoC5YP0gaOxNRkcaECAfHUCDbOkU8Jfh0QwBQoq2b9Lbz2 41PEOGhcFk6ERPGRUUuWtwANj/L+Ve6QhIbwTZNC9JQ9CAc9DWGrM6d+9E4axDDdVuxOL5 Jt7VdwdvY/5r1BQPwrc1NRLOxlQD2D7dRm177mL4TAD+Y+JlGPHEubvRb4HrWg== Received: from [192.168.1.12] (unknown [98.42.164.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QJ70s6fcqz12RB; Sat, 13 May 2023 01:13:01 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.72.23042300 Date: Fri, 12 May 2023 18:12:57 -0700 Subject: Re: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings From: Ravi Pokala To: "Simon J. Gerraty" , , , Message-ID: Thread-Topic: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings References: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> In-Reply-To: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> 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: quoted-printable X-ThisMailContainsUnwantedMimeParts: N This change also drops 'arm' from 'TARGET_ARCHES_arm' ; this was causing make -DWITH_META_MODE tinderbox to try to 'make buildworld' for arm:arm, which of course doesn't exist anym= ore. -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of "Simon J. Gerraty" > Date: Friday, May 12, 2023 at 17:42 To: >, >, > Subject: git: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd1c8420702b7ad118ca909e9f7f39a= f8a6358e73 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.m= k 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=3Dyes - -# from src/Makefile (for universe) -TARGET_ARCHES_arm?=3D arm armv6 armv7 -TARGET_ARCHES_arm64?=3D aarch64 -TARGET_ARCHES_powerpc?=3D powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?=3D riscv64 - -# some corner cases -BOOT_MACHINE_DIR.amd64 =3D boot/i386 -MACHINE_ARCH.host =3D ${_HOST_ARCH} - -# the list of machines we support -ALL_MACHINE_LIST?=3D amd64 arm arm64 i386 powerpc riscv .-include -.for m in ${ALL_MACHINE_LIST:O:u} -MACHINE_ARCH_LIST.$m?=3D ${TARGET_ARCHES_${m}:U$m} -MACHINE_ARCH.$m?=3D ${MACHINE_ARCH_LIST.$m:[1]} -BOOT_MACHINE_DIR.$m ?=3D boot/$m -.endfor - -.if empty(MACHINE_ARCH) -.if !empty(TARGET_ARCH) -MACHINE_ARCH=3D ${TARGET_ARCH} -.else -MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} -.endif -.endif -MACHINE_ARCH?=3D ${MACHINE_ARCH.${MACHINE}} -MACHINE_ARCH:=3D ${MACHINE_ARCH} - -HOST_OBJTOP ?=3D ${OBJROOT}${HOST_TARGET} - -.if ${REQUESTED_MACHINE:U${MACHINE}} =3D=3D "host" -MACHINE=3D host -.if ${TARGET_MACHINE:Uno} =3D=3D ${HOST_TARGET} -# not what we want -TARGET_MACHINE=3D host -.endif -.endif -.if ${MACHINE} =3D=3D "host" -OBJTOP :=3D ${HOST_OBJTOP} -MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} -.endif - -.if ${.MAKE.LEVEL} =3D=3D 0 || empty(PYTHON) -PYTHON ?=3D /usr/local/bin/python -.export PYTHON -# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to av= oid -# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avo= id -# problems. -.if ${MK_DIRDEPS_BUILD} =3D=3D "yes" && ${.MAKE.LEVEL} =3D=3D 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+=3D missing-meta=3Dyes .endif @@ -78,10 +19,3 @@ META_MODE+=3D missing-filemon=3Dyes # this does not need/want filemon UPDATE_DEPENDFILE=3D NO .endif - -.if ${MK_DIRDEPS_BUILD} =3D=3D "yes" -.if ${.MAKE.OS} !=3D "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} -# a pseudo option to indicate we need libegacy for host -MK_host_egacy=3D 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?=3D MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ ${.MAKE.DEPENDFILE_PREFIX} +# before we process TARGET_SPEC +# we assume that MK_DIRDEPS_BUILD=3Dyes + +# from src/Makefile (for universe) +# would be nice to have this sort of info in sys.machine.mk +TARGET_ARCHES_arm?=3D armv6 armv7 +TARGET_ARCHES_arm64?=3D aarch64 +TARGET_ARCHES_powerpc?=3D powerpc powerpc64 powerpc64le powerpcspe +TARGET_ARCHES_riscv?=3D riscv64 + +# some corner cases +BOOT_MACHINE_DIR.amd64 =3D boot/i386 +MACHINE_ARCH.host =3D ${_HOST_ARCH} + +# the list of machines we support +ALL_MACHINE_LIST?=3D amd64 arm arm64 i386 powerpc riscv + +.-include + +.for m in ${ALL_MACHINE_LIST:O:u} +MACHINE_ARCH_LIST.$m?=3D ${TARGET_ARCHES_${m}:U$m} +MACHINE_ARCH.$m?=3D ${MACHINE_ARCH_LIST.$m:[1]} +BOOT_MACHINE_DIR.$m ?=3D boot/$m +.endfor + +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH=3D ${TARGET_ARCH} +.else +MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?=3D ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:=3D ${MACHINE_ARCH} + +HOST_OBJTOP ?=3D ${OBJROOT}${HOST_TARGET} + +.if ${REQUESTED_MACHINE:U${MACHINE}} =3D=3D "host" +MACHINE=3D host +.if ${TARGET_MACHINE:Uno} =3D=3D ${HOST_TARGET} +# not what we want +TARGET_MACHINE=3D host +.endif +.endif +.if ${MACHINE} =3D=3D "host" +OBJTOP :=3D ${HOST_OBJTOP} +MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} +.endif + + +.if ${.MAKE.LEVEL} =3D=3D 0 || empty(PYTHON) +PYTHON ?=3D /usr/local/bin/python +.export PYTHON + +# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to av= oid +# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avo= id +# problems. +.if make(all) +.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. +.endif +.endif + +.if ${.MAKE.OS} !=3D "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} +# a pseudo option to indicate we need libegacy for host +MK_host_egacy=3D yes +.endif