diff --git a/ports/ctbench/portfile.cmake b/ports/ctbench/portfile.cmake index 35a2a658030a8d..038b8ad34a7bd4 100644 --- a/ports/ctbench/portfile.cmake +++ b/ports/ctbench/portfile.cmake @@ -1,11 +1,20 @@ message(WARNING "Building ${PORT} requires a C++20 compliant compiler. GCC 12 and Clang 15 are known to work.") +vcpkg_download_distfile( + BOOST_1_86_FIX + URLS https://github.com/JPenuchot/ctbench/commit/d61e61c6e6693c768f728c58bfbe3f07e404b9f7.patch?full_index=1 + FILENAME ctbench-boost-1-86-fix-d61e61c6e6693c768f728c58bfbe3f07e404b9f7.patch + SHA512 cbcba17cf71977b188456ca4abb5044d7ec99ac7fb511bf29e5a4f2fb8f1be13682f23c256f7c03e83e6e77ed0905c3b02d384bff5f9b36d3c059b2219b09b94 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jpenuchot/ctbench REF "v${VERSION}" SHA512 862bfa72c4e98983fe8ac954de02b8f931c672ad3072ca84a0b9d527baa7572cafe235400d28e1f92b86154c9007d40cc2f034510ceda638e25c63625cb9cbf9 HEAD_REF main + PATCHES + "${BOOST_1_86_FIX}" ) vcpkg_cmake_configure( diff --git a/ports/ctbench/vcpkg.json b/ports/ctbench/vcpkg.json index 3afcb60b11a735..db24fdd0b1d732 100644 --- a/ports/ctbench/vcpkg.json +++ b/ports/ctbench/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ctbench", "version": "1.3.4", + "port-version": 1, "description": "Compiler-assisted variable size benchmarking for the study of C++ metaprogram compile times.", "homepage": "https://github.com/JPenuchot/ctbench", "documentation": "https://jpenuchot.github.io/ctbench-docs/", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 50a73637c6216f..a018f98f9dcd18 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -121,7 +121,6 @@ clapack:x64-windows-static-md=skip clapack:x64-windows-static=skip clapack:x64-windows=skip clapack:x86-windows=skip -ctbench:x64-linux=fail # Fails to build with boost 1.86 lapack-reference:arm64-android=fail lapack-reference:arm64-osx=skip lapack-reference:arm64-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index 16ed1af518a433..7241be1d7562de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2070,7 +2070,7 @@ }, "ctbench": { "baseline": "1.3.4", - "port-version": 0 + "port-version": 1 }, "ctbignum": { "baseline": "2019-08-02", diff --git a/versions/c-/ctbench.json b/versions/c-/ctbench.json index 216be8958b70ef..16cc7de3433dfd 100644 --- a/versions/c-/ctbench.json +++ b/versions/c-/ctbench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86059d5165c609870e2ea47c287c60935fb3548c", + "version": "1.3.4", + "port-version": 1 + }, { "git-tree": "65af527a36df8e5a96b1f21cb62a1ac8c6b95518", "version": "1.3.4",