Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Oct 2023 07:42:02 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f22649e35840 - main - shells/nushell: fix build on armv7
Message-ID:  <202310090742.3997g2XD021565@gitrepo.freebsd.org>

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

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

commit f22649e35840ddc7d3a19b8e9dd643b3f7885e0f
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-10-09 07:00:27 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-09 07:40:32 +0000

    shells/nushell: fix build on armv7
    
     - mark as LTO_UNSAFE on armv6/armv7 to avoid address space
       exhaustion
     - remove custom do-test target to avoid a conflict with cargo.mk's
       do-test; cargo.mk's default do-test does the job well enough
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2023Q4
---
 shells/nushell/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/shells/nushell/Makefile b/shells/nushell/Makefile
index 2edd25cb071e..be61596d5b7a 100644
--- a/shells/nushell/Makefile
+++ b/shells/nushell/Makefile
@@ -607,10 +607,14 @@ DATAFRAME_DESC=		Include the dataframe feature
 DATAFRAME_VARS=		CARGO_BUILD_ARGS+=--features=dataframe
 DATAFRAME_BROKEN=	see https://github.com/nushell/nushell/issues/7665
 
+.include <bsd.port.pre.mk>
+
+# avoid address space exhaustion in compiler
+.if ${ARCH:Marmv?}
+LTO_UNSAFE=	yes
+.endif
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nu
 
-do-test:
-	@${CARGO_CARGO_RUN} test --workspace
-
-.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?202310090742.3997g2XD021565>