From 110276eb26ac2eb0cd282bfc87046df9aba0219d Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Wed, 8 Nov 2023 21:39:54 -0800 Subject: [PATCH] =?UTF-8?q?devel/doctest:=20update=202.4.8=20=E2=86=92=202?= =?UTF-8?q?.4.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 270694 Approved by: nickblack@linux.com (maintainer) --- devel/doctest/Makefile | 9 +++++++-- devel/doctest/distinfo | 6 +++--- .../doctest/files/patch-scripts_cmake_common.cmake | 13 +++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 devel/doctest/files/patch-scripts_cmake_common.cmake diff --git a/devel/doctest/Makefile b/devel/doctest/Makefile index 6fba7e78d766b..328925e7186f0 100644 --- a/devel/doctest/Makefile +++ b/devel/doctest/Makefile @@ -1,6 +1,6 @@ PORTNAME= doctest DISTVERSIONPREFIX= v -DISTVERSION= 2.4.8 +DISTVERSION= 2.4.11 CATEGORIES= devel MAINTAINER= nickblack@linux.com @@ -10,16 +10,21 @@ WWW= https://github.com/onqtam/doctest LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= compiler:c++17-lang cmake +USES= cmake:testing compiler:c++17-lang USE_GITHUB= yes GH_ACCOUNT= doctest CMAKE_OFF= DOCTEST_WITH_TESTS DOCTEST_WITH_MAIN_IN_STATIC_LIB +CMAKE_TESTING_ON= DOCTEST_WITH_TESTS # tests fail to compile, see https://github.com/doctest/doctest/issues/765 NO_ARCH= yes NO_BUILD= yes PLIST_FILES= include/doctest/doctest.h \ + include/doctest/extensions/doctest_mpi.h \ + include/doctest/extensions/doctest_util.h \ + include/doctest/extensions/mpi_reporter.h \ + include/doctest/extensions/mpi_sub_comm.h \ lib/cmake/doctest/doctest.cmake \ lib/cmake/doctest/doctestAddTests.cmake \ lib/cmake/doctest/doctestConfig.cmake \ diff --git a/devel/doctest/distinfo b/devel/doctest/distinfo index fd49349586a5b..76ea4a420ba26 100644 --- a/devel/doctest/distinfo +++ b/devel/doctest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642587207 -SHA256 (doctest-doctest-v2.4.8_GH0.tar.gz) = f52763630aa17bd9772b54e14b6cdd632c87adf0169455a86a49bd94abf2cd83 -SIZE (doctest-doctest-v2.4.8_GH0.tar.gz) = 2275833 +TIMESTAMP = 1680910110 +SHA256 (doctest-doctest-v2.4.11_GH0.tar.gz) = 632ed2c05a7f53fa961381497bf8069093f0d6628c5f26286161fbd32a560186 +SIZE (doctest-doctest-v2.4.11_GH0.tar.gz) = 2183312 diff --git a/devel/doctest/files/patch-scripts_cmake_common.cmake b/devel/doctest/files/patch-scripts_cmake_common.cmake new file mode 100644 index 0000000000000..1603f08698c7a --- /dev/null +++ b/devel/doctest/files/patch-scripts_cmake_common.cmake @@ -0,0 +1,13 @@ +- workaround for https://github.com/doctest/doctest/issues/828 + +--- scripts/cmake/common.cmake.orig 2023-11-09 05:34:19 UTC ++++ scripts/cmake/common.cmake +@@ -79,7 +79,7 @@ macro(add_compiler_flags) + endmacro() + + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- add_compiler_flags(-Werror) ++ #add_compiler_flags(-Werror) + add_compiler_flags(-fstrict-aliasing) + + # The following options are not valid when clang-cl is used.