Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Feb 2023 09:54:45 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2bedf96bada4 - main - emulators/rpcs3: unbreak on -CURRENT via devel/llvm*
Message-ID:  <202302240954.31O9sjnu047750@gitrepo.freebsd.org>

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

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

commit 2bedf96bada46ab7fa87581da4db47210b2a9eec
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-11 12:53:48 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-24 09:52:39 +0000

    emulators/rpcs3: unbreak on -CURRENT via devel/llvm*
    
    Assertion failed: (It != IISet.rend() && "ConstantExpr marked IsImmediateInvocation should " "be present"), function RemoveImmediateInvocation, file /usr/src/contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp, line 17572.
    
    Reported by:    pkg-fallout
---
 emulators/rpcs3/Makefile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 879097ddad20..6f1c3768d669 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -107,6 +107,17 @@ post-patch:
 		-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
+.include <bsd.port.options.mk>
+
+# XXX https://github.com/llvm/llvm-project/issues/58207
+.if ${_OSRELEASE:M*-CURRENT}
+# Ignore Clang assertions
+USES+=		llvm
+CC=		clang${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
+CPP=		clang-cpp${LLVM_VERSION}
+.endif
+
 # XXX Drop after FreeBSD 12.3 EOL around 2023-03-31 (don't forget distinfo)
 .if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch)
 USES+=		llvm:13,build



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302240954.31O9sjnu047750>