From nobody Wed Oct 30 18:05:03 2024 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 4Xdw5D00SXz5bmw3; Wed, 30 Oct 2024 18:05:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdw5C6bNfz4MHv; Wed, 30 Oct 2024 18:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730311503; 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=KPNnhu7MPGzBmNkenqLR/MM+xBEEzYo7mqR9d6EeHis=; b=kyDsTGsWUzaBNFs13hzJ0/Is5/wiAiRoU37zTcactKq+qQSKZUdTty4zmmTeCw4NaX7yGY n58CKBqrw+V//7TvdVUDPibDkLL/lGnMwno6SCHbPh/9hVCkrRRY/TlkdTU1Hz6EGJ0PBy P0gF7zrfCMSbzDG6xEUZ1CT/cySzqE52Um0f0CRMYj3lRMiIMR7BJSWURtlFXIfFydopGG v3DYdjh+lZEYwyuVdbbeJknnCDlqsqgo9EGjGiNM7pKe60mHtwTplsfu5y5HbPTjt0GEKi B/g/9YPgsL/jEkQ4olh8p859/RRppIWcSiENAF09OCGui3ui7ZtYYZH3gZSGng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730311503; 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=KPNnhu7MPGzBmNkenqLR/MM+xBEEzYo7mqR9d6EeHis=; b=rY3BlqQoOVLWWD3ML68W6VqMSjbyPFXu5rYFQ5wKaVt3DxZqeHuoevRTKmqf6EpjNyYo2v G/D8U8Hjnp0B0gTBf659CC0z8bVB/H9Dd4/eiul59lTWufqzPgbSpLWmsqMZyZqqU3v1zv 6x4n/FfK0KRDArzoYnp5B5lf9RIqNFDDEyV6A7xvbpZi9rLAfI8uMukdQR4egvPtEOCVgF u2ddz2geNmKlBU3foOtYvUXEcP8jomHJEYJThRn+p1nMv+Bt6mxRfflmZxHKLcL5whOORZ Uwr3O/gqzX3zHRhM9t8EdMoPWnxvEFPXNtsZt9LWug5gxYDYVTI48GM+we61kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730311503; a=rsa-sha256; cv=none; b=WyCH8JfiCgc5VnUDBDA18Y/eyF+ML4xZX3IJp47gf0COWqOkrhF6VBkCyOPUj0i6IIHLED AXixrbK/UurljSTwMWCY0ktY5pyMMCKg90xg7y9VD5+SrKWWNiPgkZvKFnJBsAcNw6xarV fZ1ix9KGG/uqA7H4eGMeKO97f5gjw5RV8D4UXWNbJrgD3qsPE1h2aIjt5tzvkkkVm2BKDS djv3rMsJ4Zj46MNlkwxGLZ6R2PDoA0m3khjBLgVNxGmohf5wdymGLaWvMYpGsRH8c5wi6H /N7ejIKIYOpZBkFKb7o1+ECuKMpWpuVIi1LwHcQA83hfHWf8PEG5PgO/W65pYg== 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 4Xdw5C6BT7z1Hft; Wed, 30 Oct 2024 18:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49UI53Yk016218; Wed, 30 Oct 2024 18:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UI53KV016215; Wed, 30 Oct 2024 18:05:03 GMT (envelope-from git) Date: Wed, 30 Oct 2024 18:05:03 GMT Message-Id: <202410301805.49UI53KV016215@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: 59e9d5118dc6 - main - emulators/rpcs3: unbreak build with libc++ 19 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 59e9d5118dc65497327518f97f252569c034f800 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=59e9d5118dc65497327518f97f252569c034f800 commit 59e9d5118dc65497327518f97f252569c034f800 Author: Jan Beich AuthorDate: 2024-10-28 10:45:23 +0000 Commit: Jan Beich CommitDate: 2024-10-30 18:03:38 +0000 emulators/rpcs3: unbreak build with libc++ 19 In file included from rpcs3/Emu/cache_utils.cpp:1: In file included from rpcs3/stdafx.h:3: In file included from rpcs3/util/types.hpp:8: In file included from /usr/include/c++/v1/chrono:969: In file included from /usr/include/c++/v1/__chrono/formatter.h:25: In file included from /usr/include/c++/v1/__chrono/ostream.h:33: In file included from /usr/include/c++/v1/__format/format_functions.h:19: In file included from /usr/include/c++/v1/__format/format_arg_store.h:25: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' static_assert(is_same<_CharT, typename traits_type::char_type>::value, ^ rpcs3/Emu/Cell/PPUAnalyser.h:184:25: note: in instantiation of template class 'std::basic_string' requested here std::basic_string applied_patches; ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here struct _LIBCPP_TEMPLATE_VIS char_traits; ^ Reported by: pkg-fallout --- emulators/rpcs3/Makefile | 17 +++++++++++++++++ emulators/rpcs3/distinfo | 2 ++ 2 files changed, 19 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 952ed67842b7..70eabfc5093f 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -97,4 +97,21 @@ post-patch: -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake +# https://github.com/RPCS3/rpcs3/issues/16259 (don't forget distinfo) +.if exists(/usr/include/c++/v1/__thread/support.h) +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-18.1.8:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 +# Don't link against new libc++ as it's not necessary +#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt + +pre-configure: bundled-libcxx +bundled-libcxx: + @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ + -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ + -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif # exists(/usr/include/c++/v1/__thread/support.h) + .include diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index a0c9de72f4bd..cdf31e3819e9 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -29,3 +29,5 @@ SHA256 (wolfSSL-wolfssl-v5.7.2-stable_GH0.tar.gz) = 0f2ed82e345b833242705bbc4b08 SIZE (wolfSSL-wolfssl-v5.7.2-stable_GH0.tar.gz) = 23591507 SHA256 (thestk-rtmidi-6.0.0_GH0.tar.gz) = ef7bcda27fee6936b651c29ebe9544c74959d0b1583b716ce80a1c6fea7617f0 SIZE (thestk-rtmidi-6.0.0_GH0.tar.gz) = 515502 +SHA256 (llvm-llvm-project-llvmorg-18.1.8_GH0.tar.gz) = 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856 +SIZE (llvm-llvm-project-llvmorg-18.1.8_GH0.tar.gz) = 205562783