svn commit: r515942 - in head/emulators/rpcs3: . files
Jan Beich
jbeich at FreeBSD.org
Tue Oct 29 00:54:27 UTC 2019
Author: jbeich
Date: Tue Oct 29 00:54:26 2019
New Revision: 515942
URL: https://svnweb.freebsd.org/changeset/ports/515942
Log:
emulators/rpcs3: switch FreeBSD 11.2/12.0 to bundled libc++
MFH: 2019Q4 (improves stability, requires previous updates)
Added:
head/emulators/rpcs3/files/extra-patch-no-cotire (contents, props changed)
Deleted:
head/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248
head/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
head/emulators/rpcs3/files/extra-patch-revert-6b1e1e402049
head/emulators/rpcs3/files/extra-patch-revert-9710473a2e3e
head/emulators/rpcs3/files/extra-patch-revert-db7042b986ab
head/emulators/rpcs3/files/extra-patch-revert-f9ad6358563b
Modified:
head/emulators/rpcs3/Makefile (contents, props changed)
head/emulators/rpcs3/distinfo (contents, props changed)
Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile Tue Oct 29 00:11:16 2019 (r515941)
+++ head/emulators/rpcs3/Makefile Tue Oct 29 00:54:26 2019 (r515942)
@@ -4,6 +4,7 @@ PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.7-8941 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g0ef7ad129
+PORTREVISION= 1
CATEGORIES= emulators
MAINTAINER= jbeich at FreeBSD.org
@@ -48,14 +49,12 @@ LLD_UNSAFE= yes # XXX ports/219089
.endif
# XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01
-# XXX Switch to bundled libc++ to avoid error-prone reverts
-.if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-db7042b986ab
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-6b1e1e402049
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-9710473a2e3e
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-f9ad6358563b
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-4504ac2d1248
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-5bd17a44c972
+.if make(makesum) || (!exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so))
+MASTER_SITES+= https://releases.llvm.org/${LLVM_VER}/:libcxx
+DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-cotire
+CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
+LLVM_VER= 8.0.0 # same as FreeBSD 11.3
.endif
OPTIONS_DEFINE= ALSA EVDEV LLVM PULSEAUDIO VULKAN
Modified: head/emulators/rpcs3/distinfo
==============================================================================
--- head/emulators/rpcs3/distinfo Tue Oct 29 00:11:16 2019 (r515941)
+++ head/emulators/rpcs3/distinfo Tue Oct 29 00:54:26 2019 (r515942)
@@ -1,4 +1,6 @@
TIMESTAMP = 1571505618
+SHA256 (libcxx-8.0.0.src.tar.xz) = c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2
+SIZE (libcxx-8.0.0.src.tar.xz) = 1752308
SHA256 (RPCS3-rpcs3-v0.0.7-8941-g0ef7ad129_GH0.tar.gz) = daf9c83bc14d274c267cc110bdfe22d1e839eec6bfa0c9ba24d2d4eae279c857
SIZE (RPCS3-rpcs3-v0.0.7-8941-g0ef7ad129_GH0.tar.gz) = 5625433
SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
Added: head/emulators/rpcs3/files/extra-patch-no-cotire
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/rpcs3/files/extra-patch-no-cotire Tue Oct 29 00:54:26 2019 (r515942)
@@ -0,0 +1,41 @@
+- Cotire precompiles system libc++ headers but bundled are needed
+
+--- rpcs3/CMakeLists.txt.orig 2019-10-27 16:17:27 UTC
++++ rpcs3/CMakeLists.txt
+@@ -1,7 +1,5 @@
+ cmake_minimum_required(VERSION 3.8.2)
+
+-include(cotire)
+-
+ # Generate git-version.h at build time.
+ include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
+
+@@ -97,12 +95,6 @@ if(WIN32)
+ else()
+ target_link_libraries(rpcs3 ${CMAKE_DL_LIBS})
+ endif()
+-
+-set_target_properties(rpcs3 PROPERTIES
+- COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+- COTIRE_ADD_UNITY_BUILD OFF)
+-
+-cotire(rpcs3)
+
+ # Copy icons to executable directory
+ if(APPLE)
+--- rpcs3/Emu/CMakeLists.txt.orig 2019-10-27 16:17:27 UTC
++++ rpcs3/Emu/CMakeLists.txt
+@@ -397,13 +397,3 @@ target_link_libraries(rpcs3_emu
+ PRIVATE
+ 3rdparty::gsl 3rdparty::xxhash
+ )
+-
+-
+-# Setup cotire
+-option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
+-
+-set_target_properties(rpcs3_emu PROPERTIES
+- COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+- COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
+-
+-cotire(rpcs3_emu)
More information about the svn-ports-head
mailing list