Date: Sun, 15 Sep 2024 11:39:52 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 59790923d575 - 2024Q3 - devel/folly: fix build with clang 19 Message-ID: <202409151139.48FBdqFq092618@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=59790923d57507ffaabc71a94f6690959d0f2919 commit 59790923d57507ffaabc71a94f6690959d0f2919 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-09-14 16:37:22 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-09-15 11:39:37 +0000 devel/folly: fix build with clang 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes devel/folly to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string_view:300:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned char>' 300 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/share/dim/ports/devel/folly/work/folly-2024.09.09.00/folly/io/Cursor.h:686:35: note: in instantiation of template class 'std::basic_string_view<unsigned char>' requested here 686 | std::basic_string_view<uint8_t> peekView() { | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Since the peekView() function is supposed to return a no longer existing type, conditionalize it for libc++ versions before 19. As far as I can see, there are no consumers of this function, except for some of the tests. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281499 Approved by: yuri (maintainer) MFH: 2024Q3 (cherry picked from commit b3459442f762df2cf1e81c582c78da1481c834f6) --- devel/folly/files/patch-folly_io_Cursor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/devel/folly/files/patch-folly_io_Cursor.h b/devel/folly/files/patch-folly_io_Cursor.h new file mode 100644 index 000000000000..f79053c883bc --- /dev/null +++ b/devel/folly/files/patch-folly_io_Cursor.h @@ -0,0 +1,18 @@ +--- folly/io/Cursor.h.orig 2024-09-07 03:24:18 UTC ++++ folly/io/Cursor.h +@@ -677,6 +677,7 @@ class CursorBase { + return ByteRange{data(), available}; + } + ++#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 190000 + /** + * Alternate version of peekBytes() that returns a std::basic_string_view + * instead of a ByteRage. +@@ -687,6 +688,7 @@ class CursorBase { + auto bytes = peekBytes(); + return {bytes.data(), bytes.size()}; + } ++#endif // _LIBCPP_VERSION < 190000 + + /** + * Alternate version of peekBytes() that returns a std::pair
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409151139.48FBdqFq092618>