git: 8f8a9b9357c8 - main - graphics/qt6-3d: fix build on i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Jul 2023 04:29:47 UTC
The branch main has been updated by lbartoletti:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8f8a9b9357c846475b76853b3925871c3e4a04ce
commit 8f8a9b9357c846475b76853b3925871c3e4a04ce
Author: Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2023-07-25 18:53:31 +0000
Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2023-07-26 04:28:56 +0000
graphics/qt6-3d: fix build on i386
PR: 272422
Exp-run by: antoine
---
graphics/qt6-3d/Makefile | 6 ++++++
graphics/qt6-3d/pkg-plist | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile
index 411876792125..0dba598a8f93 100644
--- a/graphics/qt6-3d/Makefile
+++ b/graphics/qt6-3d/Makefile
@@ -38,4 +38,10 @@ USE_GNOME= glib20
USE_QT= base declarative shadertools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
+# Disable pkg-plist for i386
+.if ${ARCH} == "i386"
+PLIST_SUB+= I386="@comment "
+.else
+PLIST_SUB+= I386=""
+.endif
.include <bsd.port.mk>
diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist
index 9877952b8a26..92cf96a4c84e 100644
--- a/graphics/qt6-3d/pkg-plist
+++ b/graphics/qt6-3d/pkg-plist
@@ -126,7 +126,7 @@
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/coresettings_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/job_common_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_p.h
-%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h
+%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/nullservices_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/propertychangehandler_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractaspect_p.h
@@ -186,9 +186,9 @@
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/sqt_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/task_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_p.h
-%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_sse_p.h
+%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_sse_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_p.h
-%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_sse_p.h
+%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_sse_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector_helper_p.h
%%QT_INCDIR%%/Qt3DCore/QAbstractAspect
%%QT_INCDIR%%/Qt3DCore/QAbstractFunctor