git: 1ea91c341e2e - 2024Q4 - science/py-dlib: fix build with libc++ 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Nov 2024 07:38:46 UTC
The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ea91c341e2e88a911f9fb07f608c11643c77938 commit 1ea91c341e2e88a911f9fb07f608c11643c77938 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-11-03 20:33:53 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-11-04 07:38:35 +0000 science/py-dlib: fix build with libc++ 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 science/py-dlib to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned int>' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/science/py-dlib/work-py311/dlib-19.24.6/dlib/bigint/../unicode/unicode.h:718:19: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here 718 | const ustring convert_to_utf32 ( | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ This can be fixed by defining `unichar` as `char32_t` instead of `uint32` in `unicode.h`, and adding a serializer for `char32_t` to `serialize.h`. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 282524 Approved by: arrowd (maintainer) MFH: 2024Q4 (cherry picked from commit e494e799b8f4976ab09b60d606f5e9ee6e3747c2) --- science/py-dlib/files/patch-dlib_serialize.h | 11 +++++++++++ science/py-dlib/files/patch-dlib_unicode_unicode.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/science/py-dlib/files/patch-dlib_serialize.h b/science/py-dlib/files/patch-dlib_serialize.h new file mode 100644 index 000000000000..94306df64159 --- /dev/null +++ b/science/py-dlib/files/patch-dlib_serialize.h @@ -0,0 +1,11 @@ +--- dlib/serialize.h.orig 2024-02-17 21:44:22 UTC ++++ dlib/serialize.h +@@ -639,6 +639,8 @@ namespace dlib + USE_DEFAULT_INT_SERIALIZATION_FOR(wchar_t) + #endif + ++ USE_DEFAULT_INT_SERIALIZATION_FOR(char32_t) ++ + // ---------------------------------------------------------------------------------------- + + inline void serialize( diff --git a/science/py-dlib/files/patch-dlib_unicode_unicode.h b/science/py-dlib/files/patch-dlib_unicode_unicode.h new file mode 100644 index 000000000000..4527fdc054b0 --- /dev/null +++ b/science/py-dlib/files/patch-dlib_unicode_unicode.h @@ -0,0 +1,11 @@ +--- dlib/unicode/unicode.h.orig 2024-02-17 21:44:22 UTC ++++ dlib/unicode/unicode.h +@@ -16,7 +16,7 @@ namespace dlib + + // ---------------------------------------------------------------------------------------- + +- using unichar = uint32; ++ using unichar = char32_t; + using ustring = std::basic_string<unichar>; + + // ----------------------------------------------------------------------------------------