From nobody Tue Nov 30 00:57:20 2021 X-Original-To: dev-commits-ports-main@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 AD6701895266; Tue, 30 Nov 2021 00:57:20 +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 4J33hw25Rgz3GsL; Tue, 30 Nov 2021 00:57:20 +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 1CE344E13; Tue, 30 Nov 2021 00:57:20 +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 1AU0vKmf001240; Tue, 30 Nov 2021 00:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AU0vKBx001239; Tue, 30 Nov 2021 00:57:20 GMT (envelope-from git) Date: Tue, 30 Nov 2021 00:57:20 GMT Message-Id: <202111300057.1AU0vKBx001239@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: 30ccf5784223 - main - emulators/rpcs3: unbreak on FreeBSD 12.2 via full libc++ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 30ccf5784223c05cc3b06b768b1dc4c57b596a15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638233840; 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=6r0m29Ws4eG11Us7BDXeyR4n1+QcGnJWRzNSIGkq4j8=; b=CaZc98odfssW5G+EzDCNfMmR9pRP7ZjasFE/GPlWvwYr2G/R9LGR+ueJzlTQ0A7N3yiw5/ UI21gr0OLisivO6uar09Syisp2xpRHmrIalSYdwI6ddst2ndNXhCIFDx4Sztw0+dk9Fxz0 WU9xIxsZHXhc8Iuk9I14w6PGI089eNEdg+YvGfqR2wUnzX5vNzvjjrm8sXWYRcwbVp7zLZ FrTAb7HQ59LJhRf4p2oJyRh/zs2qCwCygkK4t3ThAbP5KZjLDvuZEqKgTg1p63j1viLiPW sIDiRfnhaQMI3AjdPVZV0aThy0Diyxvv8hepk21VTXjOL19cw0+JR57TUu3Iig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638233840; a=rsa-sha256; cv=none; b=vKepSaZyMq5W4cPIUxNaO0QEcN/Ymz1B13YtvAhFCohXkt3cLQ2zWQRC2J5bMgdp6WlYGG LLSG64Vhr5ubF/lUWSL6MnK4cRWZ9z0GUOe+NtY30G2neRDEW9SfcJu4ntEPE0Jc+OIQnd 12fdD6dTxBFzREC1u5tTrQKONLHSVDGxOc+YuGBN3wZyPfqd9kzXBMmMQrZuUCf5xAOmzd F5ZXFhIjqnaHSKeXmK+I+cX+30wTrw1Z689ojBpQBWuHKSQpC9h+WI/bvIyGPoz1wTd4FK Dgm+/LHSDZtQ7VaIvRCmjcCOx7xw+2R3i4YzrWuKTqJAI/76HdCMtG5qna3aSA== 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=30ccf5784223c05cc3b06b768b1dc4c57b596a15 commit 30ccf5784223c05cc3b06b768b1dc4c57b596a15 Author: Jan Beich AuthorDate: 2021-11-29 23:57:33 +0000 Commit: Jan Beich CommitDate: 2021-11-30 00:57:08 +0000 emulators/rpcs3: unbreak on FreeBSD 12.2 via full libc++ Link statically to avoid ABI mismatch with in-base libc++. Building libc++ requires full LLVM source, so align with devel/llvm12. --- emulators/rpcs3/Makefile | 14 ++++++++++---- emulators/rpcs3/distinfo | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index d42fc9f7729e..0f36939fa0f0 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg -BROKEN_FreeBSD_12= ld: error: undefined symbol: std::__1::__cxx_atomic_notify_one ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 @@ -101,9 +100,16 @@ 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+= libcxx-${LLVM_VER}.src.tar.xz:libcxx -CXXFLAGS+= -nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include -LLVM_VER= 12.0.0 +DISTFILES+= llvm-project-${LLVM_VER}.src.tar.xz: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: + @${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 + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .include diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 24656d58d9d6..644e5ae02795 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ TIMESTAMP = 1638053061 -SHA256 (libcxx-12.0.0.src.tar.xz) = 7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1 -SIZE (libcxx-12.0.0.src.tar.xz) = 1880864 +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-13056-g38bfefcdf_GH0.tar.gz) = a91a793f5a037f35963ba61182a537122ffa79c68affa374858d78d4dfe96a1f SIZE (RPCS3-rpcs3-v0.0.19-13056-g38bfefcdf_GH0.tar.gz) = 8163177 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = d6aecf7a9e4d6f4935f1da5fd29cb8011f76567c8e5b571b7410e2fa6942bf37