Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Aug 2023 19:47:03 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2b18305d9abb - main - x11-toolkits/qt6-declarative: fix plist on powerpc* / riscv64
Message-ID:  <202308101947.37AJl3Xv059494@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

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

commit 2b18305d9abb208f5c3b5b603f34ada9ddde809a
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-08-10 19:46:33 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-08-10 19:47:01 +0000

    x11-toolkits/qt6-declarative: fix plist on powerpc* / riscv64
---
 x11-toolkits/qt6-declarative/Makefile  | 8 ++++++++
 x11-toolkits/qt6-declarative/pkg-plist | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile
index da5e7e887f5d..1af521f4f806 100644
--- a/x11-toolkits/qt6-declarative/Makefile
+++ b/x11-toolkits/qt6-declarative/Makefile
@@ -29,6 +29,14 @@ USE_QT=		base shadertools languageserver
 USE_XORG=	x11 xau xcb xdmcp
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv?} || ${ARCH} == i386
+PLIST_SUB+=	QML_JIT=""
+.else
+PLIST_SUB+=	QML_JIT="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s#python3#${PYTHON_CMD}#g" ${WRKSRC}/cmake/QtDeclarativeSetup.cmake
 
diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist
index 6c816fd8371c..66ae4959342a 100644
--- a/x11-toolkits/qt6-declarative/pkg-plist
+++ b/x11-toolkits/qt6-declarative/pkg-plist
@@ -218,10 +218,10 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayiterator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assemblercommon_p.h
+%%QML_JIT%%%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assemblercommon_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4atomics_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4baselineassembler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4baselinejit_p.h
+%%QML_JIT%%%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4baselineassembler_p.h
+%%QML_JIT%%%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4baselinejit_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodegenerator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodehandler_p.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308101947.37AJl3Xv059494>