Date: Fri, 12 May 2023 18:12:57 -0700 From: Ravi Pokala <rpokala@freebsd.org> To: "Simon J. Gerraty" <sjg@FreeBSD.org>, <src-committers@FreeBSD.org>, <dev-commits-src-all@FreeBSD.org>, <dev-commits-src-main@FreeBSD.org> Subject: Re: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings Message-ID: <DE4B6850-22A9-4084-BDEA-B9F13F0485E8@panasas.com> In-Reply-To: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> References: <202305130042.34D0gjq4050929@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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: <owner-src-committers@freebsd.org <mailto:owner-src-committers@freebs= d.org>> on behalf of "Simon J. Gerraty" <sjg@FreeBSD.org <mailto:sjg@FreeBSD= .org>> Date: Friday, May 12, 2023 at 17:42 To: <src-committers@FreeBSD.org <mailto:src-committers@FreeBSD.org>>, <dev-= commits-src-all@FreeBSD.org <mailto:dev-commits-src-all@FreeBSD.org>>, <dev-= commits-src-main@FreeBSD.org <mailto:dev-commits-src-main@FreeBSD.org>> 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 <https://cgit.FreeBSD.org/src/commit/?id=3Dd1c8420702b7ad118ca909e9= f7f39af8a6358e73> commit d1c8420702b7ad118ca909e9f7f39af8a6358e73 Author: Simon J. Gerraty <sjg@FreeBSD.org <mailto:sjg@FreeBSD.org>> AuthorDate: 2023-05-13 00:40:37 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org <mailto:sjg@FreeBSD.org>> 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 <site.meta.sys.env.mk> -.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 <site.sys.dirdeps.env.mk> + +.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DE4B6850-22A9-4084-BDEA-B9F13F0485E8>