From e175d8d19dfe9ba4c4e82bd43835346d34f87e56 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 14 May 2026 16:41:12 -0700 Subject: [PATCH] [hyperscan] Disable unit tests. (#51775) --- ports/hyperscan/0001-remove-Werror.patch | 18 ++---------------- ports/hyperscan/0003-disable-tests.patch | 12 ++++++++++++ ports/hyperscan/portfile.cmake | 1 + ports/hyperscan/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hyperscan.json | 5 +++++ 6 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 ports/hyperscan/0003-disable-tests.patch diff --git a/ports/hyperscan/0001-remove-Werror.patch b/ports/hyperscan/0001-remove-Werror.patch index 0b3f53177f..2638a06daa 100644 --- a/ports/hyperscan/0001-remove-Werror.patch +++ b/ports/hyperscan/0001-remove-Werror.patch @@ -1,27 +1,13 @@ -From e2c0779de8096623be874c5fa0d275113b9d1204 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 14:44:36 -0700 -Subject: [PATCH] remove Werror - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83197af..d27eb76 100644 +index 7757916..14d12d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -235,8 +235,8 @@ else() +@@ -242,8 +242,6 @@ else() if (NOT RELEASE_BUILD) # -Werror is most useful during development, don't potentially break # release builds - set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") - set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -Werror") -+ #set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") -+ #set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -Werror") endif() if (DISABLE_ASSERTS) --- -2.24.3 (Apple Git-128) - diff --git a/ports/hyperscan/0003-disable-tests.patch b/ports/hyperscan/0003-disable-tests.patch new file mode 100644 index 0000000000..632f082a55 --- /dev/null +++ b/ports/hyperscan/0003-disable-tests.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14d12d0..5b9ff9c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -546,7 +546,6 @@ if (CORRECT_PCRE_VERSION AND PCRE_BUILD_SOURCE AND BUILD_STATIC_LIBS) + set(BUILD_CHIMERA TRUE) + endif() + +-add_subdirectory(unit) + if (EXISTS ${CMAKE_SOURCE_DIR}/tools/CMakeLists.txt) + add_subdirectory(tools) + endif() diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index 4b1699a427..1394832a7b 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES 0001-remove-Werror.patch 0002-fix-threads.patch + 0003-disable-tests.patch # also avoids old vendored gtest that fails on MSVC 19.51+ due to removed std::tr1 ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json index 10e07f36f7..38caf73117 100644 --- a/ports/hyperscan/vcpkg.json +++ b/ports/hyperscan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hyperscan", "version": "5.4.2", - "port-version": 2, + "port-version": 3, "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", "homepage": "https://www.hyperscan.io", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cf1e0823e5..bbd5a9f519 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3890,7 +3890,7 @@ }, "hyperscan": { "baseline": "5.4.2", - "port-version": 2 + "port-version": 3 }, "hypodermic": { "baseline": "2023-03-03", diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json index 81f610272d..e45bf2871b 100644 --- a/versions/h-/hyperscan.json +++ b/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f362c4cd38fb85f99792228ddac5fbd66ccdcc18", + "version": "5.4.2", + "port-version": 3 + }, { "git-tree": "9dbae1281767ae0d017623fd79e4e46a54779b17", "version": "5.4.2",