Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Feb 2024 06:58:42 GMT
From:      Charlie Li <vishwin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: a42b94911f1a - 2024Q1 - lang/python311: Fix build on armv7 with LLVM 17
Message-ID:  <202402080658.4186wgsY049358@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by vishwin:

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

commit a42b94911f1a406fbc2e0efc46376c33e866e33b
Author:     Benjamin Jacobs <freebsd@dev.thsi.be>
AuthorDate: 2024-02-04 18:13:23 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2024-02-08 06:57:42 +0000

    lang/python311: Fix build on armv7 with LLVM 17
    
    Reported by: brd
    PR: 276249
    
    (cherry picked from commit 5b0b801228eba3d1dfc39b9b595b3a089e118dc1)
---
 lang/python311/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lang/python311/Makefile b/lang/python311/Makefile
index 7a79bb544cce..f2b04ef29cc9 100644
--- a/lang/python311/Makefile
+++ b/lang/python311/Makefile
@@ -107,6 +107,15 @@ EXTRA_PATCHES+=	${PATCHDIR}/libressl
 CONFIGURE_ENV+=	ac_cv_working_openssl_hashlib=yes
 .endif
 
+.include <bsd.port.pre.mk>
+
+# llvm17 with -flto=thin makes Programs/_freeze_module crash on armv7; workaround
+# cf. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276249
+.if ${ARCH} == armv7 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 170 && \
+	${COMPILER_VERSION} < 180
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:N${LTO_CONFIGURE_ON}}
+.endif
+
 post-patch:
 # disable the detection of includes and library from e2fsprogs-libuuid,
 # which introduces hidden dependency and breaks build
@@ -148,4 +157,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 
-.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?202402080658.4186wgsY049358>