From nobody Sat Dec 24 16:37:13 2022 X-Original-To: dev-commits-ports-main@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 4NfV7t02LQz1HP9r; Sat, 24 Dec 2022 16:37:14 +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 4NfV7s6k3pz3Lw4; Sat, 24 Dec 2022 16:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671899833; 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=FR325G/S86MEEMCBU8ty7X/4vqZw3GjuraVLx1gFb9g=; b=ktSanI7bgxUYcKoltNQLvBAVq+Ku9X1g3ANZZ2OtS3jzEZfoqFzvE+eOMx3a0l65h5ceSE BOrQ35PZLa/DEtG3dsECkb8OmcE59Djaq8053Dqjqpvgb6aVRmiMWz+rOP6eMq3nF71Tdn nC0fydJxDNKS0TOEWSpZErxQbBIfsYELXYx8XqMs7DA7bG3Xcb+BNsLFhtd1yVjUFrggAM krOyzC90u0JdsnXm2+cCTwAQ/42UTp6RkDJ7XTK0q9yHkBsmIw8ET8QM87ZXhtQIhjiU0N 8aQvDIXs6OsXOqHkz2o/4zMTXv4Z95abvWyGTIqajagKfqT68QiPn1NPghG+IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671899833; 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=FR325G/S86MEEMCBU8ty7X/4vqZw3GjuraVLx1gFb9g=; b=mMeiTTwOenl1jR1yiInMwoSz3SYXTO/5HJWD+viui5y9W5cj7HZgKuyq4z8RbVsbIHVQQ3 e2BTyN8/UTLrVb/w0XMm0xgJBY9sY0IVpIyIOyN20MnREWfhspYxShK8/5nGz8+7DXOSN4 tRMSY5maf7Ts/tj72cF6olQDjnvKUeQI+VOIWGIbLE4f+4ZmDZ5CkPZe3lOaK6eL+yJd+6 zKn8BzXUauHlmA03bL4rWkXg1AbL0seZEzyA0oAv7FGXCMIakhgeMneiYU3kY3idtTJyPq +Q6GYnzFWOPKXzNtKOPrRf87Aju9Yo6wADqAy4/SeLcohiIZDEoQQsIf2BWexA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671899833; a=rsa-sha256; cv=none; b=l7BrYe5O4eVWWMd148bgzvFQbco8PbHXYF+iOxwf3fvPkdNFg1qtYHbJ9ZWML6hzcPhZYJ sxqa1Pd+575PWlGMEMwkaQ7Ejyn6wkjE4MNNGDI8f6XGbr735IdB4ucqKzaA4WrtoRRPul jvtCYZe26i3mII7qWiO4CmnR2lzXktKCzpv5pUgtTdxwjlEV3uvQX7F9cONA8TY+ym4ckJ odnT7gyH0b0HftxloSSHHqLPt6GgEFKoZfcAggtJwlHX9+4WO1x4dTrAjLKGdnqfxKJuPu FccJ4X/qRCPdaSJcmD2BBHRd9DZpGSYxoQA+Cd52sJTKVD6TLHX/A752+Rn0uw== 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 4NfV7s5hgtzKRH; Sat, 24 Dec 2022 16:37:13 +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 2BOGbDUL075167; Sat, 24 Dec 2022 16:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BOGbDEw075166; Sat, 24 Dec 2022 16:37:13 GMT (envelope-from git) Date: Sat, 24 Dec 2022 16:37:13 GMT Message-Id: <202212241637.2BOGbDEw075166@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: 0c0c236d7350 - main - emulators/rpcs3: switch back to llvm13 to unbreak FreeBSD < 13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3 commit 0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3 Author: Jan Beich AuthorDate: 2022-12-24 15:30:43 +0000 Commit: Jan Beich CommitDate: 2022-12-24 16:35:07 +0000 emulators/rpcs3: switch back to llvm13 to unbreak FreeBSD < 13 FAILED: rpcs3/Emu/CMakeFiles/rpcs3_emu.dir/Cell/lv2/sys_net/lv2_socket_p2p.cpp.o [...] 1. parser at end of file #0 0x000000082c9b0ac9 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/usr/local/llvm15/lib/libLLVM-15.so+0x33b0ac9) #1 0x000000082c9aeca5 llvm::sys::RunSignalHandlers() (/usr/local/llvm15/lib/libLLVM-15.so+0x33aeca5) #2 0x000000082c8d00c5 (/usr/local/llvm15/lib/libLLVM-15.so+0x32d00c5) #3 0x0000000822fadc60 (/lib/libthr.so.3+0x14c60) clang-15: error: clang frontend command failed with exit code 139 (use -v to see invocation) clang version 15.0.6 Target: x86_64-portbld-freebsd12.3 Thread model: posix InstalledDir: /usr/local/llvm15/bin Reported by: pkg-fallout This reverts commit 8bc04d76429085159ef900144e7267b8ce4b70c4. --- emulators/rpcs3/Makefile | 6 +++--- emulators/rpcs3/distinfo | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 5601df745052..df3b4ff3cca1 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,6 +2,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.25-14499 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g5b95cfda40 +PORTREVISION= 1 CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org @@ -109,7 +110,7 @@ post-patch: # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} -LLVM_DEFAULT= 15 # bump if not latest release +LLVM_DEFAULT= 13 # bump if not latest release .endif BUILD_DEPENDS+= clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USES:= ${USES:Ncompiler*} @@ -118,14 +119,13 @@ CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} # XXX Move into separate port and standardize via USES -GH_TUPLE+= llvm:llvm-project:llvmorg-15.0.6:libcxx +GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:M*Ninja*} \ - -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 64f5ec20ef05..d6f040fdffcb 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -21,7 +21,7 @@ SHA256 (kinetiknz-cubeb-cubeb-0.2-1391-gdc511c6_GH0.tar.gz) = 904cbd1e3abc0983ef SIZE (kinetiknz-cubeb-cubeb-0.2-1391-gdc511c6_GH0.tar.gz) = 223020 SHA256 (wolfSSL-wolfssl-v5.5.0-stable_GH0.tar.gz) = c34b74b5f689fac7becb05583b044e84d3b10d39f38709f0095dd5d423ded67f SIZE (wolfSSL-wolfssl-v5.5.0-stable_GH0.tar.gz) = 18814382 -SHA256 (llvm-llvm-project-llvmorg-15.0.6_GH0.tar.gz) = 4d857d7a180918bdacd09a5910bf9743c9861a1e49cb065a85f7a990f812161d -SIZE (llvm-llvm-project-llvmorg-15.0.6_GH0.tar.gz) = 166301026 +SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c41157364421820228df66632802a4a6a7c9c17f86a7340802 +SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251 SHA256 (59e69944056b.patch) = e0b286d4ceae6c5bffc95be2f3044e40ac5e4c6e0796ac421fa90fa3978a68dd SIZE (59e69944056b.patch) = 112588