From nobody Fri Feb 24 09:54:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PNQGs2cgZz3tmjN; Fri, 24 Feb 2023 09:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNQGs24BLz3jVp; Fri, 24 Feb 2023 09:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677232485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16jz/4GX99Y0atbFOty78w7cmhblnIVamZmZzROTx1Q=; b=L/4AanWylCWnBbYvmOX1BDBtlXakl8+i3qu4rTapYl2TCEa/EcwqkPvguRoa6XqllqAU6y C2do1GRxpdFIb3/DaGf93ul1gcJLUnobBJP7W++GGOL85b95gDDOc/ccy4B5M9OuWj6qxt 2XqFH+60vToecX/FHC88BRUdXGsXJA2hfV6dWn+DMbhBrLDCVZpPLQXUATWoUihmKrnGRC WhhWsfo9KH601cXDCF+nVx3ct37ms0u0hlxakmB3SfxX8qDyyVorpcRi60LfG8wLVOBT3c RAM+vzCVWW2pDXmVmLlDHoEnolBPA4MWsMOV5XLnZZvZNG9KWXAnCm0qDwAibA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677232485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16jz/4GX99Y0atbFOty78w7cmhblnIVamZmZzROTx1Q=; b=ZELWVGw9Jw6nZd3IRtxh5Kos2d7vZHTau5HsVqR3Vt1SBaDooVNgGyv+W9Vyv2qt8vLN9+ +WE259mE+LGvGwJwnDO6+T5TmQ7DlqIJ5zAOIytla/SbnkKoFL26K1XUq9n1FlA9GCEM5Y 9yD6M2mivZen+B+Gtb44SZTiKB5Ym4yLLr5sDPI3j0KzBZBbxVWHd+XuNhZ4LIsXJC5Tk7 zBII/qOXjwQ7axhhex9NU72rsRyz6wkOJLx/RDfOgDjUIScRvhRTdbEwxjfC0h54D9Ldci iTV7+uQCGGEaUBlbe5ligA0rUkbZ33IHF1JEdON83zUg0w7Pal0dFOk1lJJPjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677232485; a=rsa-sha256; cv=none; b=iTMHsBqVXSzIayk9MCDI971TugY7jdJpvzq3ZSZ8AY9SI4jSboXUJ61HLFZLBArKoipHH7 6MGD1bZWoZ5Ef7pdJZuiei/rWp3DUoMYiyOE8QKXM9KYLk0jcgyOA5g/TRum408ktQla9Q 7SkTXjvZn7a5ap61l/X66bnALlCuSblkkcyQp/SWzi5EixwNWJOg8K8D/MrOKxeISNNju6 8kR6pMJc6c2JVQ0EG8freX1OMj6b1Vx60m1QRqIZTPVPOQZObSJXbgcnjYJdJUG1XuPwjn QbfxXgR0/RbfLBQJhk32nLRAhWfsazlaiNLrBjnRiSJZvrzwio7QcunabSFjSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PNQGs16hdzKD8; Fri, 24 Feb 2023 09:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31O9sjkT047751; Fri, 24 Feb 2023 09:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O9sjnu047750; Fri, 24 Feb 2023 09:54:45 GMT (envelope-from git) Date: Fri, 24 Feb 2023 09:54:45 GMT Message-Id: <202302240954.31O9sjnu047750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 2bedf96bada4 - main - emulators/rpcs3: unbreak on -CURRENT via devel/llvm* List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bedf96bada46ab7fa87581da4db47210b2a9eec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bedf96bada46ab7fa87581da4db47210b2a9eec commit 2bedf96bada46ab7fa87581da4db47210b2a9eec Author: Jan Beich AuthorDate: 2023-02-11 12:53:48 +0000 Commit: Jan Beich 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 + +# 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