Date: Fri, 9 Sep 2022 07:04:29 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 15ea9b69ec02 - main - devel/directfb: Use GNU as to assemble files on armv6/armv7 Message-ID: <202209090704.28974Tac080101@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=15ea9b69ec020042ca2e7a10be4d6d67dc9223d6 commit 15ea9b69ec020042ca2e7a10be4d6d67dc9223d6 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-08-02 04:30:12 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2022-09-09 06:50:12 +0000 devel/directfb: Use GNU as to assemble files on armv6/armv7 Clang's integrated assembler can't handle the old split syntax used in this project's assembly files. Assembly with GNU as instead. PR: 265566 --- devel/directfb/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index a3c58bdd23fe..8400f03758cb 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -22,7 +22,7 @@ OPTIONS_SUB= yes CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= cpe gmake jpeg libtool ncurses pathfix perl5 pkgconfig +USES= compiler cpe gmake jpeg libtool ncurses pathfix perl5 pkgconfig USE_LDCONFIG= yes USE_PERL5= build PORTDOCS= * @@ -57,6 +57,14 @@ SDL_CONFIGURE_ENABLE= sdl UNIQUE_CONFIGURE_ENABLE= unique TEST_CONFIGURE_WITH= tests +.include <bsd.port.pre.mk> + +# assembly files use old split syntax which clang doesn't like +.if ${ARCH:Marmv?} && ${COMPILER_TYPE} == "clang" +BUILD_DEPENDS+= as:devel/binutils +CFLAGS+= -fno-integrated-as +.endif + post-patch: @${REINPLACE_CMD} -e \ '/need_libc_r=yes/d ; \ @@ -74,4 +82,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html .endfor -.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?202209090704.28974Tac080101>