git: e0f09a5cba35 - main - devel/clipp: Fix build of dependent ports with c++17 and above
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Sep 2023 03:23:17 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0f09a5cba350e153e96e585c720d2980d05aa8c commit e0f09a5cba350e153e96e585c720d2980d05aa8c Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-09-22 03:16:55 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-09-22 03:16:55 +0000 devel/clipp: Fix build of dependent ports with c++17 and above - Bump PORTREVISION for package change --- devel/clipp/Makefile | 1 + devel/clipp/files/patch-include-clipp.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/devel/clipp/Makefile b/devel/clipp/Makefile index ce035d1848c0..85d6f931c28e 100644 --- a/devel/clipp/Makefile +++ b/devel/clipp/Makefile @@ -1,6 +1,7 @@ PORTNAME= clipp PORTVERSION= 1.2.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org diff --git a/devel/clipp/files/patch-include-clipp.h b/devel/clipp/files/patch-include-clipp.h new file mode 100644 index 000000000000..7f4ae967a8b2 --- /dev/null +++ b/devel/clipp/files/patch-include-clipp.h @@ -0,0 +1,26 @@ +--- include/clipp.h.orig 2023-09-19 20:16:06 UTC ++++ include/clipp.h +@@ -160,7 +160,11 @@ constexpr auto + check_is_callable(int) -> decltype( + std::declval<Fn>()(std::declval<Args>()...), + std::integral_constant<bool, ++#if __cplusplus >= 201703L ++ std::is_same<Ret,typename std::invoke_result_t<Fn, Args...>>::value>{} ); ++#else + std::is_same<Ret,typename std::result_of<Fn(Args...)>::type>::value>{} ); ++#endif + + template<class,class,class...> + constexpr auto +@@ -171,7 +175,11 @@ constexpr auto + check_is_callable_without_arg(int) -> decltype( + std::declval<Fn>()(), + std::integral_constant<bool, ++#if __cplusplus >= 201703L ++ std::is_same<Ret,typename std::invoke_result_t<Fn>>::value>{} ); ++#else + std::is_same<Ret,typename std::result_of<Fn()>::type>::value>{} ); ++#endif + + template<class,class> + constexpr auto