qiurui
/
freebsd-ports
mirror of https://git.FreeBSD.org/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

science/dlib-cpp: fix build with clang and 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/dlib-cpp 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/dlib-cpp/work/dlib-19.24/dlib/bigint/../unicode/unicode.h:496:26: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here
    496 |     inline const ustring convert_utf8_to_utf32 (
        |                          ^
  /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
     23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
        |                             ^

These can be fixed by using `char32_t` instead of `uint32_t` for the
`unichar` type.

Also, clang 19 now implements CWG 96 [1], which requires a template
argument list after a 'template' keyword, resulting in errors similar
to:

  /wrkdirs/usr/ports/science/dlib-cpp/work/dlib-19.24/dlib/filtering/../global_optimization/find_max_global.h:61:130: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
     61 |             static auto go(T&& f, const matrix<double,0,1>& a) -> decltype(call_function_and_expand_args<max_unpack-1>::template go(std::forward<T>(f),a))
        |                                                                                                                                  ^

This can be fixed by adding `<>` after the `go` identifier.

[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals

PR:		281975
Approved by:	arrowd (maintainer)
MFH:		2024Q3

(cherry picked from commit e8b1dca337)
This commit is contained in:
Dimitry Andric 2024-10-08 12:28:32 +02:00
parent fe3ea27323
commit b67619a7aa
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
science/dlib-cpp/files/patch-dlib_global__optimization_find__max__global.h Normal file
View File

@ -0,0 +1,11 @@
--- dlib/global_optimization/find_max_global.h.orig 2022-05-08 14:35:36 UTC
+++ dlib/global_optimization/find_max_global.h
@@ -58,7 +58,7 @@ namespace dlib
}
template <typename T>
- static auto go(T&& f, const matrix<double,0,1>& a) -> decltype(call_function_and_expand_args<max_unpack-1>::template go(std::forward<T>(f),a))
+ static auto go(T&& f, const matrix<double,0,1>& a) -> decltype(call_function_and_expand_args<max_unpack-1>::template go<>(std::forward<T>(f),a))
{
return call_function_and_expand_args<max_unpack-1>::go(std::forward<T>(f),a);
}

10
science/dlib-cpp/files/patch-dlib_serialize.h Normal file
View File

@ -0,0 +1,10 @@
--- dlib/serialize.h.orig 2022-05-08 14:35:36 UTC
+++ dlib/serialize.h
@@ -626,6 +626,7 @@ namespace dlib
USE_DEFAULT_INT_SERIALIZATION_FOR(unsigned long)
USE_DEFAULT_INT_SERIALIZATION_FOR(uint64)
USE_DEFAULT_INT_SERIALIZATION_FOR(int64)
+ USE_DEFAULT_INT_SERIALIZATION_FOR(char32_t)
USE_DEFAULT_BYTE_SERIALIZATION_FOR(char)
USE_DEFAULT_BYTE_SERIALIZATION_FOR(signed char)

11
science/dlib-cpp/files/patch-dlib_unicode_unicode.h Normal file
View File

@ -0,0 +1,11 @@
--- dlib/unicode/unicode.h.orig 2022-05-08 14:35:36 UTC
+++ dlib/unicode/unicode.h
@@ -16,7 +16,7 @@ namespace dlib
// ----------------------------------------------------------------------------------------
- typedef uint32 unichar;
+ typedef char32_t unichar;
#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 4
struct unichar_traits