move to own git serverHEADmaster

4 files changed, 136 insertions, 0 deletions

diff --git a/vcpkg/ports/hyperscan/0001-remove-Werror.patch b/vcpkg/ports/hyperscan/0001-remove-Werror.patch
new file mode 100644
index 0000000..0b3f531
--- /dev/null
+++ b/vcpkg/ports/hyperscan/0001-remove-Werror.patch
@@ -0,0 +1,27 @@
+From e2c0779de8096623be874c5fa0d275113b9d1204 Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+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
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,8 +235,8 @@ 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/vcpkg/ports/hyperscan/0002-fix-threads.patch b/vcpkg/ports/hyperscan/0002-fix-threads.patch
new file mode 100644
index 0000000..4cc2a76
--- /dev/null
+++ b/vcpkg/ports/hyperscan/0002-fix-threads.patch
@@ -0,0 +1,40 @@
+diff --git a/tools/hscheck/CMakeLists.txt b/tools/hscheck/CMakeLists.txt
+index 2ae0613..3a47776 100644
+--- a/tools/hscheck/CMakeLists.txt
++++ b/tools/hscheck/CMakeLists.txt
+@@ -11,7 +11,7 @@ if (BUILD_CHIMERA)
+     add_definitions(-DHS_HYBRID)
+     add_executable(hscheck ${hscheck_SOURCES})
+     if(NOT WIN32)
+-        target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil pthread)
++        target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil Threads::Threads)
+     else()
+         target_link_libraries(hscheck hs chimera pcre expressionutil)
+     endif()
+@@ -22,7 +22,7 @@ else()
+         add_executable(hscheck ${hscheck_SOURCES})
+     endif()
+     if(NOT WIN32)
+-        target_link_libraries(hscheck hs expressionutil pthread)
++        target_link_libraries(hscheck hs expressionutil Threads::Threads)
+     else()
+         target_link_libraries(hscheck hs expressionutil)
+     endif()
+diff --git a/tools/hscollider/CMakeLists.txt b/tools/hscollider/CMakeLists.txt
+index a4d71b2..ca9fa0c 100644
+--- a/tools/hscollider/CMakeLists.txt
++++ b/tools/hscollider/CMakeLists.txt
+@@ -68,11 +68,11 @@ add_dependencies(hscollider ragel_ColliderCorporaParser)
+ if(NOT WIN32)
+     if (BUILD_CHIMERA)
+         target_link_libraries(hscollider hs chimera ${PCRE_LDFLAGS} databaseutil
+-            expressionutil corpusomatic crosscompileutil pthread
++            expressionutil corpusomatic crosscompileutil Threads::Threads
+         "${BACKTRACE_LDFLAGS}")
+     else()
+         target_link_libraries(hscollider hs ${PCRE_LDFLAGS} databaseutil
+-            expressionutil corpusomatic crosscompileutil pthread
++            expressionutil corpusomatic crosscompileutil Threads::Threads
+         "${BACKTRACE_LDFLAGS}")
+     endif()
+ 
diff --git a/vcpkg/ports/hyperscan/portfile.cmake b/vcpkg/ports/hyperscan/portfile.cmake
new file mode 100644
index 0000000..4b1699a
--- /dev/null
+++ b/vcpkg/ports/hyperscan/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO intel/hyperscan

+    REF "v${VERSION}"

+    SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509

+    HEAD_REF master

+    PATCHES

+        0001-remove-Werror.patch

+        0002-fix-threads.patch

+)

+

+vcpkg_find_acquire_program(PYTHON3)

+

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

+    OPTIONS

+        "-DPYTHON_EXECUTABLE=${PYTHON3}"

+        "-DRAGEL=${CURRENT_HOST_INSTALLED_DIR}/tools/ragel${VCPKG_HOST_EXECUTABLE_SUFFIX}"

+        -DBUILD_EXAMPLES=OFF

+)

+

+vcpkg_cmake_install()

+

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

+

+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

+

+vcpkg_fixup_pkgconfig()

+

diff --git a/vcpkg/ports/hyperscan/vcpkg.json b/vcpkg/ports/hyperscan/vcpkg.json
new file mode 100644
index 0000000..10e07f3
--- /dev/null
+++ b/vcpkg/ports/hyperscan/vcpkg.json
@@ -0,0 +1,39 @@
+{
+  "name": "hyperscan",
+  "version": "5.4.2",
+  "port-version": 2,
+  "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",
+  "supports": "!arm",
+  "dependencies": [
+    "boost-array",
+    "boost-chrono",
+    "boost-config",
+    "boost-core",
+    "boost-crc",
+    "boost-detail",
+    "boost-dynamic-bitset",
+    "boost-functional",
+    "boost-graph",
+    "boost-icl",
+    "boost-multi-array",
+    "boost-ptr-container",
+    "boost-random",
+    "boost-regex",
+    "boost-system",
+    "boost-thread",
+    "boost-type-traits",
+    "boost-unordered",
+    "boost-utility",
+    "pcre",
+    {
+      "name": "ragel",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}