Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 May 2026 03:22:31 +0000
From:      Jason E. Hale <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d8483e9c7384 - main - Mk/Uses/qt-dist.mk: Fix build with multiple Python installations
Message-ID:  <6a190677.35ba7.52ed1b7@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d8483e9c7384866659fbeb9f9e0551dc392a9d74

commit d8483e9c7384866659fbeb9f9e0551dc392a9d74
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2026-05-29 02:13:48 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2026-05-29 02:21:01 +0000

    Mk/Uses/qt-dist.mk: Fix build with multiple Python installations
    
    Force SBOM generation to use the default Python.
    
    While here, quote paths for safety.
    
    Reported by:    Daniel Toschläger <<d.toschlaeger@pm.me>
---
 Mk/Uses/qt-dist.mk | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index a6279a91a00c..13e828aab0bb 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -201,21 +201,22 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
 
 # Build setup for Qt6
 .  if ${_QT_VER:M6}
-CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-			-DINSTALL_BINDIR=${PREFIX}/${QT_BINDIR_REL} \
-			-DINSTALL_PUBLICBINDIR=${PREFIX}/bin \
-			-DINSTALL_LIBDIR=${PREFIX}/${QT_LIBDIR_REL} \
-			-DINSTALL_LIBEXECDIR=${PREFIX}/${QT_LIBEXECDIR_REL} \
-			-DINSTALL_DOCDIR=${PREFIX}/${QT_DOCDIR_REL} \
-			-DINSTALL_ARCHDATADIR=${PREFIX}/${QT_ARCHDIR_REL} \
-			-DINSTALL_DATADIR=${PREFIX}/${QT_DATADIR_REL} \
-			-DINSTALL_INCLUDEDIR=${PREFIX}/${QT_INCDIR_REL} \
-			-DINSTALL_MKSPECSDIR=${PREFIX}/${QT_MKSPECDIR_REL} \
-			-DINSTALL_EXAMPLESDIR=${PREFIX}/${QT_EXAMPLEDIR_REL} \
-			-DINSTALL_DESCRIPTIONSDIR=${PREFIX}/${QT_DESCRIPTIONSDIR_REL} \
+CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+			-DINSTALL_BINDIR="${PREFIX}/${QT_BINDIR_REL}" \
+			-DINSTALL_PUBLICBINDIR="${PREFIX}/bin" \
+			-DINSTALL_LIBDIR="${PREFIX}/${QT_LIBDIR_REL}" \
+			-DINSTALL_LIBEXECDIR="${PREFIX}/${QT_LIBEXECDIR_REL}" \
+			-DINSTALL_DOCDIR="${PREFIX}/${QT_DOCDIR_REL}" \
+			-DINSTALL_ARCHDATADIR="${PREFIX}/${QT_ARCHDIR_REL}" \
+			-DINSTALL_DATADIR="${PREFIX}/${QT_DATADIR_REL}" \
+			-DINSTALL_INCLUDEDIR="${PREFIX}/${QT_INCDIR_REL}" \
+			-DINSTALL_MKSPECSDIR="${PREFIX}/${QT_MKSPECDIR_REL}" \
+			-DINSTALL_EXAMPLESDIR="${PREFIX}/${QT_EXAMPLEDIR_REL}" \
+			-DINSTALL_DESCRIPTIONSDIR="${PREFIX}/${QT_DESCRIPTIONSDIR_REL}" \
 			-DQT_QMAKE_TARGET_MKSPEC:String=freebsd-clang \
-			-DQT_SBOM_GENERATE_JSON:BOOL=OFF \
-			-DQT_SBOM_VERIFY:BOOL=OFF \
+			-DQT_SBOM_FORCE_USE_PYTHON_INTERP:BOOL=ON \
+			-DQT_SBOM_PYTHON_INTERP="${PYTHON_CMD}" \
+			-DQT_SBOM_VERIFY_SPDX_V2:BOOL=OFF \
 			--log-level=TRACE
 .  endif
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a190677.35ba7.52ed1b7>