Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Feb 2023 20:17:42 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 278ced6f36e6 - main - math/py-fastcluster: fix build on powerpc* with LLVM 14 by forcing 15
Message-ID:  <202302082017.318KHgRH096426@gitrepo.freebsd.org>

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

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

commit 278ced6f36e6b428c4f718bd8536a0b4884816e9
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-02-08 16:12:30 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-02-08 20:17:09 +0000

    math/py-fastcluster: fix build on powerpc* with LLVM 14 by forcing 15
    
    Assertion failed: ((CGF.CurFuncDecl == nullptr || CGF.Builder.getIsFPConstrained() || isa<CXXConstructorDecl>(CGF.CurFuncDecl) || isa<CXXDestructorDecl>(CGF.CurFuncDecl) || (NewExceptionBehavior == llvm::fp::ebIgnore && NewRoundingBehavior == llvm::RoundingMode::NearestTiesToEven)) && "FPConstrained should be enabled on entire function"), function ConstructorHelper, file /usr/local/poudriere/jails/main-powerpc64/usr/src/contrib/llvm-project/clang/lib/CodeGen/CodeGenFunction.cpp, line 163.
---
 math/py-fastcluster/Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index 4171f07b9e1c..345bb163e182 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -14,10 +14,19 @@ LICENSE_FILE=	${WRKSRC}/COPYING.txt
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9,1:math/py-numpy@${PY_FLAVOR}
 
-USES=		python:3.7+
+USES=		compiler python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} == 140
+BUILD_DEPENDS+=	clang15:devel/llvm15
+CPP=            clang-cpp15
+CC=             clang15
+CXX=            clang++15
+.endif
+
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
-.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?202302082017.318KHgRH096426>