Date: Mon, 6 Jan 2025 23:08:20 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 17176071892c - 2025Q1 - devel/outcome: fix build on armv7 Message-ID: <202501062308.506N8KFh071048@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=17176071892ca70f60d685b378ed99135326ee5b commit 17176071892ca70f60d685b378ed99135326ee5b Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2025-01-04 11:24:38 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2025-01-06 23:08:00 +0000 devel/outcome: fix build on armv7 On ARM, section types are spelled with % instead of @ as @ is the comment characters. Approved by: yuri (maintainer) PR: 283840 MFH: 2025Q1 (cherry picked from commit 684e90ff96b5e2aba9eadb25298de1dcb54c6615) --- devel/outcome/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/devel/outcome/Makefile b/devel/outcome/Makefile index d6c9f407ef5e..0bf9531eabda 100644 --- a/devel/outcome/Makefile +++ b/devel/outcome/Makefile @@ -10,8 +10,6 @@ WWW= https://ned14.github.io/outcome/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/Licence.txt -BROKEN_armv7= fails to compile due to inline assembly, see https://github.com/ned14/outcome/issues/309 - BUILD_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib RUN_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib @@ -26,8 +24,14 @@ CMAKE_TESTING_ON= BUILD_TESTING OUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST CMAKE_ARGS= -Dquickcpplib_DIR=${LOCALBASE}/lib/cmake/quickcpplib NO_BUILD= yes -NO_ARCH= yes PORTSCOUT= limit:^.*[0-9]\.[0-9].* -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${ARCH:Marmv?} +pre-configure: + ${FIND} ${WRKDIR} \( -name \*.hpp -o -name \*.h \) -exec ${REINPLACE_CMD} -e 's,@progbits,%progbits,' {} + +.endif + +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501062308.506N8KFh071048>