Date: Fri, 14 Oct 2022 07:19:25 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: f387e9fd6163 - 2022Q4 - devel/qt6-base: fix build on armv6/armv7 Message-ID: <202210140719.29E7JPhc079812@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q4 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f387e9fd61632bd41ebb66e6808d6b1875aacd0e commit f387e9fd61632bd41ebb66e6808d6b1875aacd0e Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-10-04 22:03:00 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2022-10-14 07:19:10 +0000 devel/qt6-base: fix build on armv6/armv7 The port bundles assembly code from the pixman library. On armv6/armv7, the GNU assembler is required to assemble it. Pass appropriate flags to do so. PR: 266829 (cherry picked from commit 76fa8695d9c814e0d5e9b8e28bcf6e897422b435) --- devel/qt6-base/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index b336b2f122ba..cbfa588d39eb 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -112,6 +112,13 @@ SQLITE_CMAKE_ON= -DFEATURE_sql_sqlite=ON \ SQLITE_CMAKE_OFF= -DFEATURE_sql_sqlite=OFF SQLITE_USES= sqlite:3 +.include <bsd.port.pre.mk> + +.if ${ARCH} == "armv6" || ${ARCH} == "armv7" +BUILD_DEPENDS+= as:devel/binutils +CMAKE_ARGS+= -DCMAKE_ASM_FLAGS=-no-integrated-as +.endif + # TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories # for the cmake files in INSTALL_PREFIX/lib/cmake post-install: @@ -123,4 +130,4 @@ post-install: ${RLN} $$t; \ done <${WRKDIR}/.build/user_facing_tool_links.txt -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210140719.29E7JPhc079812>