Date: Fri, 11 Oct 2024 11:47:28 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 613a30bc5677 - 2024Q4 - Mk/bsd.port.mk: Add MACHINE_ARCH to WRK_ENV Message-ID: <202410111147.49BBlSH1064752@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=613a30bc56776e1d6156d15de51e4f827e97118d commit 613a30bc56776e1d6156d15de51e4f827e97118d Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-09-07 22:06:27 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-10-11 11:45:16 +0000 Mk/bsd.port.mk: Add MACHINE_ARCH to WRK_ENV make(1) has a built-in variable MACHINE_ARCH that defaults to the value of sysctl hw.machine_arch. This is not correct when building packages under qemu. In that case poudriere sets MACHINE_ARCH in its make.conf. Since commit d7511b9d0074 make.conf is not picked up by make during build so pass MACHINE_ARCH through the environment. This affects building kmod ports under qemu. This is a workaround for make not looking at UNAME_p when setting MACHINE_ARCH. It does look at UNAME_m when setting MACHINE. PR: 281674 Reported by: jrtc27 Exp-run by: antoine Approved by: portmgr (antoine) (cherry picked from commit 3154506a168d8188fe06f252e070b394b6581db3) --- Mk/bsd.port.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 110506bc9121..669c200f47c6 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1616,6 +1616,7 @@ PKG_NOTE_flavor= ${FLAVOR} . endif WRK_ENV+= HOME=${WRKDIR} \ + MACHINE_ARCH=${MACHINE_ARCH} \ PWD="$${PWD}" \ __MAKE_CONF=${NONEXISTENT} . for e in OSVERSION PATH TERM TMPDIR \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410111147.49BBlSH1064752>