Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Sep 2020 00:38:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548268 - in head/emulators/rpcs3: . files
Message-ID:  <202009120038.08C0c04R072742@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep 12 00:37:59 2020
New Revision: 548268
URL: https://svnweb.freebsd.org/changeset/ports/548268

Log:
  emulators/rpcs3: switch bundled libc++
  
  Stop grafting parts of future libc++ to reduce maintenance.

Deleted:
  head/emulators/rpcs3/files/patch-libc++8
Modified:
  head/emulators/rpcs3/Makefile   (contents, props changed)
  head/emulators/rpcs3/distinfo   (contents, props changed)

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Sat Sep 12 00:37:47 2020	(r548267)
+++ head/emulators/rpcs3/Makefile	Sat Sep 12 00:37:59 2020	(r548268)
@@ -4,6 +4,7 @@ PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.12-10860 # git rev-list --count HEAD
 DISTVERSIONSUFFIX=	-g676fed7cf
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -55,6 +56,14 @@ USES:=		${USES:Ncompiler*}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
+
+# XXX Drop after FreeBSD 11.3/12.1 EOL
+.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
+MASTER_SITES+=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
+DISTFILES+=	libcxx-${LLVM_VER}.src.tar.xz:libcxx
+CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
+LLVM_VER=	10.0.1
+.endif
 
 OPTIONS_DEFINE=	ALSA EVDEV FAUDIO PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN

Modified: head/emulators/rpcs3/distinfo
==============================================================================
--- head/emulators/rpcs3/distinfo	Sat Sep 12 00:37:47 2020	(r548267)
+++ head/emulators/rpcs3/distinfo	Sat Sep 12 00:37:59 2020	(r548268)
@@ -1,4 +1,6 @@
 TIMESTAMP = 1599515417
+SHA256 (libcxx-10.0.1.src.tar.xz) = def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c
+SIZE (libcxx-10.0.1.src.tar.xz) = 1839172
 SHA256 (RPCS3-rpcs3-v0.0.12-10860-g676fed7cf_GH0.tar.gz) = 8b5e31d38c5e46406ae30f565b31340b412fad700842aa70a964bb6a61312af8
 SIZE (RPCS3-rpcs3-v0.0.12-10860-g676fed7cf_GH0.tar.gz) = 8483264
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009120038.08C0c04R072742>