From nobody Sat Dec 24 16:37:14 2022 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 4NfV7v1FpKz1HPNm; Sat, 24 Dec 2022 16:37:15 +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 4NfV7v07pyz3MJ0; Sat, 24 Dec 2022 16:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671899835; 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=ZRQ9Yaq5RG+2EgsZH+SpICUxiFQaLzhasH6x5BTDUsM=; b=K4+A4RoFsDiMVlIyArLvDMthRQAnKHyQKIY2IgFFybeCydhtoaP/KoR4bZvPD0YD3TLXOG yjJOwOVgGVMsMGyTgDsERISDlmlyJvTQ4/EsB90eeFKz/h0jalKMXZi7gAH6aSEN2jO23Q SW8Axpivrs8PmK3LmBImNfcoN+IPFvhMKldRQMWe4fFJ+zOtF6IV5c7fb4tLEie9YTAOnp XYid67ajnZ6gitEU5n5dhBRp39Tjd5qB3wbA7BA0d7LG2oyema5wTvJk7Fp8gbbqi8Ne8o Inm9yQHgiyvbcXqWOpakzAsSr0T+LjHOLFYEy2Y89DBLf/RE8vWDXWxbbDLuDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671899835; 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=ZRQ9Yaq5RG+2EgsZH+SpICUxiFQaLzhasH6x5BTDUsM=; b=W8fT3HHQJtSpsCYO88/b05ykUEjnGX7wUcXFyZAGAngVz8oAAEgo5NXwKPQCtn+0G69lUI dO/ZVXEp3DdH6tqerXJ7K/H1aDGLtcyZ4L0FWVm/IQ1bc5BsDu0XMrmzLvOTOdE9/WagtX HAl2270jXx4Bzoc3YPmSK8Y+whYu6yODdaHWGhdlvnfwUiFCAcADK9w0748iUh2WY2sB+x UoScwUA/uu0gW0IJmo0gOZ7B1DF3vv3dqthSb5imsm4+VYPjv7obv0SLt+qK0ijbPxFcQ3 F2q8/7MSLDOkspdWCet71ckhUVLoIOeG0AN+OKw5YW7rBEJSZ4V8ge4WHVGYCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671899835; a=rsa-sha256; cv=none; b=E7l55xN9oWm+7wIKN0nMOwLsjVLnJX0YzrJpjYAeCWMyVSotZQ3KDCYXI1M2VuE1n+1F/J 2XiUpEVsr9ScHJxoblo5ALcYcCOBZtAbIdHW4aCuds+fJup4ytTJWFRf05raZS/Aat5WWn qrnabqdLT/AgzjuOQBsuQT8a27hwHWerTYCTuo7gPc2bHMC+yWVQDqTFfIlotXZLKK8IUe 23sgnxaqQinlLZHiMp1OA/90e8XDF4Ead9mV7x0XMfgFHX02pCg49ymMJB4Zp9e63O1Kz8 fv1j76X2B9oYmnuegwlWSKGi+j2K+vvezM7smjCrgqQdfGKjrdOzGCu5aOXrSw== 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 4NfV7t68zczL86; Sat, 24 Dec 2022 16:37:14 +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 2BOGbERV075194; Sat, 24 Dec 2022 16:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BOGbE1C075193; Sat, 24 Dec 2022 16:37:14 GMT (envelope-from git) Date: Sat, 24 Dec 2022 16:37:14 GMT Message-Id: <202212241637.2BOGbE1C075193@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: cac460734976 - main - emulators/rpcs3: limit llvm13 dependency to FreeBSD 12.3 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: cac460734976d1db837a52a2ddd047c0adaf8194 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cac460734976d1db837a52a2ddd047c0adaf8194 commit cac460734976d1db837a52a2ddd047c0adaf8194 Author: Jan Beich AuthorDate: 2022-12-24 15:38:02 +0000 Commit: Jan Beich CommitDate: 2022-12-24 16:35:07 +0000 emulators/rpcs3: limit llvm13 dependency to FreeBSD 12.3 Base clang 10 is too old: rpcs3/util/types.hpp:1170:20: error: substitution into constraint expression resulted in a non-constant expression concept PtrSame = (is_same_ptr()); ^~~~~~~~~~~~~~~~~~~ rpcs3/Emu/IdManager.h:701:18: note: while checking the satisfaction of concept 'PtrSame' requested here static_assert((PtrSame && ...), "Invalid ID type combination"); ^~~~~~~~~~~~~~~ rpcs3/Emu/VFS.cpp:940:7: note: in instantiation of function template specialization 'idm::select >' requested here idm::select([&](u32 id, lv2_file& file) ^ Base libc++ 10 is too old: rpcs3/Emu/RSX/Common/simple_array.hpp:287:17: error: no template named 'predicate' in namespace 'std' bool any(std::predicate auto predicate) const ~~~~~^ rpcs3/Emu/RSX/Common/simple_array.hpp:299:20: error: no template named 'predicate' in namespace 'std' void filter(std::predicate auto predicate) ~~~~~^ rpcs3/Emu/RSX/Common/simple_array.hpp:317:18: error: no template named 'predicate' in namespace 'std' void sort(std::predicate auto predicate) ~~~~~^ --- emulators/rpcs3/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index df3b4ff3cca1..caad21ce8fbf 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,7 +2,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.25-14499 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g5b95cfda40 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org @@ -106,17 +106,12 @@ post-patch: -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake -.include - -# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) -.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} -LLVM_DEFAULT= 13 # bump if not latest release -.endif -BUILD_DEPENDS+= clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -USES:= ${USES:Ncompiler*} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} +# XXX Drop after FreeBSD 12.3 EOL around 2023-03-01 (don't forget distinfo) +.if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch) +USES+= llvm:13,build +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1:libcxx @@ -129,5 +124,6 @@ bundled-libcxx: -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif -.include +.include