diff --git a/ports/hexl/disable_downloading_cpu_features.patch b/ports/hexl/disable_downloading_cpu_features.patch deleted file mode 100644 index c80681e67e..0000000000 --- a/ports/hexl/disable_downloading_cpu_features.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 16095678843dadf13b0f786ddf53c726e837bc74 Mon Sep 17 00:00:00 2001 -From: Wei Dai -Date: Tue, 8 Jun 2021 15:55:18 -0700 -Subject: [PATCH] Disabled downloading cpu-features. - ---- - CMakeLists.txt | 9 ++++++++- - hexl/CMakeLists.txt | 15 ++++++--------- - 2 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05e42f9..a7ad993 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,7 +183,14 @@ message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") - #------------------------------------------------------------------------------ - # Third-party code... - #------------------------------------------------------------------------------ --add_subdirectory(cmake/cpu-features) -+find_package(CpuFeatures CONFIG REQUIRED) -+if(CpuFeatures_FOUND) -+ add_library(cpu_features ALIAS CpuFeatures::cpu_features) -+ get_target_property( -+ CpuFeatures_INCLUDE_DIR -+ CpuFeatures::cpu_features -+ INTERFACE_INCLUDE_DIRECTORIES) -+endif() - - if (HEXL_TESTING OR HEXL_BENCHMARK OR HEXL_DEBUG) - if(NOT TARGET Threads::Threads) -diff --git a/hexl/CMakeLists.txt b/hexl/CMakeLists.txt -index 7e603e3..b83a94e 100644 ---- a/hexl/CMakeLists.txt -+++ b/hexl/CMakeLists.txt -@@ -44,6 +44,7 @@ target_include_directories(hexl - PUBLIC $ # Public headers - PUBLIC $ # Public headers - ) -+target_include_directories(hexl PUBLIC ${CpuFeatures_INCLUDE_DIR}) # Public headers - - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(hexl PRIVATE -Wall -Wconversion -Wshadow -pedantic -Wextra -@@ -74,7 +75,7 @@ else () - # For proper export of IntelHEXLConfig.cmake / IntelHEXLTargts.cmake, - # we avoid explicitly linking dependencies via target_link_libraries, since - # this would add dependencies to the exported hexl target. -- add_dependencies(hexl cpu_features) -+ target_link_libraries(hexl PRIVATE cpu_features) - if (HEXL_DEBUG) - add_dependencies(hexl gflags) - # Manually add logging include directory -@@ -95,42 +96,38 @@ else () - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - add_custom_command(TARGET hexl POST_BUILD - COMMAND ar -x $ -- COMMAND ar -x $ - COMMAND ar -x $ - COMMAND ar -x $ - COMMAND ar -qcs $ *.o - COMMAND rm -f *.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features gflags easyloggingpp -+ DEPENDS hexl gflags easyloggingpp - ) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - add_custom_command(TARGET hexl POST_BUILD - COMMAND lib.exe /OUT:$ - $ -- $ - $ - $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features gflags easyloggingpp -+ DEPENDS hexl gflags easyloggingpp - ) - endif() - else() - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - add_custom_command(TARGET hexl POST_BUILD - COMMAND ar -x $ -- COMMAND ar -x $ - COMMAND ar -qcs $ *.o - COMMAND rm -f *.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features -+ DEPENDS hexl - ) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - add_custom_command(TARGET hexl POST_BUILD - COMMAND lib.exe /OUT:$ - $ -- $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features -+ DEPENDS hexl - ) - endif() - endif() --- -2.25.1 - diff --git a/ports/hexl/find_dependency_cpu_features.patch b/ports/hexl/find_dependency_cpu_features.patch deleted file mode 100644 index fbc79ec878..0000000000 --- a/ports/hexl/find_dependency_cpu_features.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b399342016573d6f45bd5bb1aa8d4df358e0761c Mon Sep 17 00:00:00 2001 -From: Wei Dai -Date: Wed, 16 Jun 2021 18:21:51 -0700 -Subject: [PATCH] Fixed config. - ---- - cmake/HEXLConfig.cmake.in | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/cmake/HEXLConfig.cmake.in b/cmake/HEXLConfig.cmake.in -index 57089bd..f112380 100644 ---- a/cmake/HEXLConfig.cmake.in -+++ b/cmake/HEXLConfig.cmake.in -@@ -11,6 +11,14 @@ - - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+find_dependency(CpuFeatures) -+if(NOT CpuFeatures_FOUND) -+ message(WARNING "Could not find dependency `CpuFeatures` required by this configuration") -+ set(HEXL_FOUND FALSE) -+ return() -+endif() -+ - include(${CMAKE_CURRENT_LIST_DIR}/HEXLTargets.cmake) - - # Defines HEXL_FOUND: If Intel HEXL library was found --- -2.25.1 - diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index fa3362c669..74d6735d52 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - REF 2dc1db6824be3fc89d13740efd0270ec9afec77e - SHA512 aaa80dc53a21586d763a2b84b40d60062020470988422601bc5e9c2b31c6263847a97ea8f956d002a95e2d5e843cafa96fabdfd8b8ee892c7a7b9747133adebb - HEAD_REF main - PATCHES - disable_downloading_cpu_features.patch - find_dependency_cpu_features.patch + REF df6c26fdd2f2752e2bfa17981be113ff32946375 + SHA512 c4353410091b019dad05326818d66bc74b438a26ec28192da20f13581781556b7aad11c3e9c2c2c9ed7ec66bc422152e2a2811206109b39939f30c91952ef765 + HEAD_REF 1.2.1 ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -18,23 +15,21 @@ else() set(HEXL_SHARED ON) endif() +vcpkg_find_acquire_program(GIT) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DHEXL_DEBUG=OFF" "-DHEXL_BENCHMARK=OFF" - "-DHEXL_EXPORT=ON" "-DHEXL_COVERAGE=OFF" "-DHEXL_TESTING=OFF" "-DHEXL_SHARED_LIB=${HEXL_SHARED}" ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake") - vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.1") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/hexl/vcpkg.json b/ports/hexl/vcpkg.json index d75a263a7b..4908514514 100644 --- a/ports/hexl/vcpkg.json +++ b/ports/hexl/vcpkg.json @@ -1,11 +1,12 @@ { "name": "hexl", - "version": "1.1.0", + "version": "1.2.1", "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", "supports": "x64 & !(windows & !static)", "dependencies": [ "cpu-features", + "easyloggingpp", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index c5271320a4..4f4bbcc55e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2533,7 +2533,7 @@ "port-version": 0 }, "hexl": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "hffix": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index dbee52a465..45b391e053 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14a96b80d062ba4dea3d18839c4d737792584a3c", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "abbac3846835a67c818b2fd51c32a1e859aca7b3", "version": "1.1.0",