From owner-svn-ports-head@freebsd.org Tue Dec 22 04:39:46 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49F1E4B297F; Tue, 22 Dec 2020 04:39:46 +0000 (UTC) (envelope-from jbeich@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0Nst1bFnz3Gw1; Tue, 22 Dec 2020 04:39:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 297802E00D; Tue, 22 Dec 2020 04:39:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BM4djpf027421; Tue, 22 Dec 2020 04:39:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BM4dj28027420; Tue, 22 Dec 2020 04:39:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202012220439.0BM4dj28027420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 22 Dec 2020 04:39:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558889 - head/emulators/rpcs3 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/rpcs3 X-SVN-Commit-Revision: 558889 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 04:39:46 -0000 Author: jbeich Date: Tue Dec 22 04:39:45 2020 New Revision: 558889 URL: https://svnweb.freebsd.org/changeset/ports/558889 Log: emulators/rpcs3: prefer llvm11 by default Suggested by: upstream Modified: head/emulators/rpcs3/Makefile (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Tue Dec 22 03:35:53 2020 (r558888) +++ head/emulators/rpcs3/Makefile Tue Dec 22 04:39:45 2020 (r558889) @@ -4,6 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.13-11452 # git rev-list --count HEAD DISTVERSIONSUFFIX= -gbd269bcca +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -49,21 +50,6 @@ CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_ CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU -# https://bugs.llvm.org/show_bug.cgi?id=46557 -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.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 @@ -95,4 +81,24 @@ post-patch: -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake -.include +.include + +# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) +.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} +LLVM_DEFAULT= 11 # 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.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 + +.include