diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/hyperscan | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/hyperscan')
| -rw-r--r-- | ports/hyperscan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/hyperscan/portfile.cmake | 25 |
2 files changed, 8 insertions, 19 deletions
diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL index bf45c2238..2f04703a9 100644 --- a/ports/hyperscan/CONTROL +++ b/ports/hyperscan/CONTROL @@ -1,4 +1,4 @@ Source: hyperscan
-Version: 5.0.1-1
+Version: 5.0.1-2
Description: A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.
Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, python3, ragel
\ No newline at end of file diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index be8410b38..2b48087ba 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -1,24 +1,18 @@ -# Build with 'vcpkg.exe install hyperscan:x86-windows-static-release'; Hyperscan doesn't support dynamic libraries on Windows.
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
set(HYPERSCAN_VERSION 5.1.0)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/intel/hyperscan/archive/v${HYPERSCAN_VERSION}.zip"
- FILENAME "v${HYPERSCAN_VERSION}.zip"
- SHA512 89a826c1e66175f1781f57d0d430f2d5d245ab590acc4b5df6638c5f6fe43914db028f8bc86e566ea27b55883c91be0d8da079b3d7547899f7cf540b52a3cf0a
-)
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- REF ${HYPERSCAN_VERSION})
+ REPO intel/hyperscan
+ REF v${HYPERSCAN_VERSION}
+ SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
+ HEAD_REF master
+)
vcpkg_find_acquire_program(PYTHON3)
-
-# Add python3 to path
get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
vcpkg_add_to_path(PREPEND ${PYTHON_PATH})
vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
@@ -31,11 +25,6 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/hyperscan RENAME copyright)
-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME hs)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|