diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2022-12-24 15:30:43 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2022-12-24 16:35:07 +0000 |
| commit | 0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3 (patch) | |
| tree | 62418b179257e630ffac904004e0d22bf301d78e | |
| parent | 0b16928300fd7e1377e0200456d73dc6cb03d65e (diff) | |
| download | ports-0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3.tar.gz ports-0c0c236d7350e47c8d2cd3e352a0f97ef848b7a3.zip | |
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. <eof> 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.
| -rw-r--r-- | emulators/rpcs3/Makefile | 6 | ||||
| -rw-r--r-- | 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 |