From nobody Tue Nov 30 14:49:58 2021 X-Original-To: dev-commits-ports-all@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 7A73918A9C3E; Tue, 30 Nov 2021 14:49:59 +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 4J3Q9g1fDmz4sjT; Tue, 30 Nov 2021 14:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1001E18135; Tue, 30 Nov 2021 14:49:59 +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 1AUEnwrg007975; Tue, 30 Nov 2021 14:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUEnwq3007974; Tue, 30 Nov 2021 14:49:58 GMT (envelope-from git) Date: Tue, 30 Nov 2021 14:49:58 GMT Message-Id: <202111301449.1AUEnwq3007974@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: 11e15e9fac67 - main - emulators/rpcs3: switch to llvm13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 11e15e9fac676d22b0b77c7c75191baafff48c80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638283799; 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=fBYTHQK+ddJD0j5Dn8Y0LvFYnJLY07OzttrPtOpmgwQ=; b=PromR74W4xD3oShUA5XavJd6IuBv1wtZzp9mBUjJ22RXRqCYyBun6g39qVhV95ZYYJFvpX PONqAcJqKteAuqdV3+NoIv+y3YtO3ly5pRnvYN/c7QAOhyBaaCsdsq7shmsKK8+XN2LOHh z08TKonvqeToueFsr1cBp2dRnZBpbzZTlUAN2cUBFBJn6ZKHVK2W9iCDsjDzjDEj1DXs8z fBZKbdiurAuoYopFaHVkzb0Fo/RrLPT19vaX0WaQlT1V9bYrMaGKf9MzYLRfab5jl7+3El dayvHUVvBnWxlVf8t/ZXHGq05Y2NqoFqxqQOec3oqe93SQtV89wOsYEsMpRwoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638283799; a=rsa-sha256; cv=none; b=YUbWq/twHFlDxvsx1fiLjASzepud+uLtpXMkbNgDDcasqr5XlhTQhPtSb9zeIXvxjdiCTi TMx7TRQfh2VQgqCnmovs8HfQ+FP+L5wK5x9db2eX0nwxu9n35mo2HTblZMHXXaexRD4U7+ ZtnTbZUSQNr3/ccFx/HmKFF9pNslxhTAVnJi2/NEttbuX4U9d3CZisUmWCo8CEB8dTpeYR xnfSqtVlTgKllw+qxnprkd5X1/uxj968KjRt+ye6OjQJmavOfMmcAWiw4eOucCX1SUBVs+ yx7JiDzuedCpDehCN0EZkVjE1vJWqdkUhS/PnWsj/AO3CiJZBs5En3qVF6M5pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=11e15e9fac676d22b0b77c7c75191baafff48c80 commit 11e15e9fac676d22b0b77c7c75191baafff48c80 Author: Jan Beich AuthorDate: 2021-11-30 14:05:22 +0000 Commit: Jan Beich CommitDate: 2021-11-30 14:49:56 +0000 emulators/rpcs3: switch to llvm13 --- emulators/rpcs3/Makefile | 16 +++++++--------- emulators/rpcs3/distinfo | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 17c477e41b7e..a5541c94bd03 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,6 +2,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.19-13060 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g270c2e58a +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -94,7 +95,7 @@ post-install: # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} -LLVM_DEFAULT= 12 # 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*} @@ -102,19 +103,16 @@ CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} -# XXX Drop after FreeBSD 12.2 EOL -.if make(makesum) || (!exists(/usr/include/c++/v1/__bits) && exists(/usr/lib/libc++.so)) -MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx -DISTFILES+= llvm-project-${LLVM_VER}.src.tar.xz:libcxx +# XXX Drop after FreeBSD 12.3 EOL +GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1-rc1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt -LLVM_VER= 12.0.1 -pre-configure: +pre-configure: bundled-libcxx +bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:M*Ninja*} \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ - -B ${WRKDIR}/libcxx_build -S ${WRKDIR}/llvm-project-${LLVM_VER}.src/libcxx + -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build -.endif .include diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 7266cf219cd2..58a457c4fc36 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,4 @@ TIMESTAMP = 1638220359 -SHA256 (llvm-project-12.0.1.src.tar.xz) = 129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e -SIZE (llvm-project-12.0.1.src.tar.xz) = 90910004 SHA256 (RPCS3-rpcs3-v0.0.19-13060-g270c2e58a_GH0.tar.gz) = 4a4c0159533c85f069c36e09b54173bf2dae4ec1a7dd82b2951aeddff09eff81 SIZE (RPCS3-rpcs3-v0.0.19-13060-g270c2e58a_GH0.tar.gz) = 8163098 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = d6aecf7a9e4d6f4935f1da5fd29cb8011f76567c8e5b571b7410e2fa6942bf37 @@ -27,3 +25,5 @@ SHA256 (wolfSSL-wolfssl-v4.8.1-stable_GH0.tar.gz) = 50db45f348f47e00c93dd244c241 SIZE (wolfSSL-wolfssl-v4.8.1-stable_GH0.tar.gz) = 10467737 SHA256 (zeux-pugixml-v1.11.4_GH0.tar.gz) = 017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade SIZE (zeux-pugixml-v1.11.4_GH0.tar.gz) = 566750 +SHA256 (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = c9411f1882eaf0c190fd5b412deb0bd7dba61a48df243d3408298cc6f53b6921 +SIZE (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = 147284646