Date: Tue, 05 May 2026 01:46:28 +0000 Message-ID: <69f94bf4.3ee5c.4626d2cd@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa870156ad30556166c6ea81d345b41618cdcece commit fa870156ad30556166c6ea81d345b41618cdcece Author: Li-Wen Hsu <lwhsu@FreeBSD.org> AuthorDate: 2026-05-05 01:45:52 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2026-05-05 01:45:52 +0000 Uses/linux.mk: Restore i386 guard for linux-c7-* Without this, when USE_LINUX_RPM=yes (LIB_DISTNAMES) is used with linux:c7 and the port sets ONLY_FOR_ARCHS=amd64, the i686 RPM is still being added to DISTFILES_amd64, causing fetching a file not in distinfo. This fixes devel/linux-ltp build. Reviewed by: arrowd Fixes: 5aa75e1ca0fc Linuxulator ports: Introduce Rocky Linux 9 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56796 --- Mk/Uses/linux.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 929310a2e744..3b53c89daa74 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -306,7 +306,9 @@ DISTFILES_aarch64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \ . if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \ && empty(NOT_FOR_ARCHS:Mamd64) . ifndef DISTFILES_amd64 -. if ${linux_ARGS} == c7 +. if ${linux_ARGS} == c7 \ + && !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \ + && empty(NOT_FOR_ARCHS:Mi386) DISTFILES_amd64= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ ${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} . endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f94bf4.3ee5c.4626d2cd>