Date: Tue, 30 Nov 2021 14:49:58 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 11e15e9fac67 - main - emulators/rpcs3: switch to llvm13 Message-ID: <202111301449.1AUEnwq3007974@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=11e15e9fac676d22b0b77c7c75191baafff48c80 commit 11e15e9fac676d22b0b77c7c75191baafff48c80 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-11-30 14:05:22 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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 <bsd.port.post.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111301449.1AUEnwq3007974>