aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Höner <joel@zyantific.com>2020-03-03 06:30:06 +0100
committerGitHub <noreply@github.com>2020-03-02 21:30:06 -0800
commitaf78cf0195433c34ffedb33c0cbd14e0187a4418 (patch)
treeaa431b8dfc5086361a3bac04fd75c4a212955c48
parent129fb5a7486aa3d4f02caf1aefae93300b751067 (diff)
downloadvcpkg-af78cf0195433c34ffedb33c0cbd14e0187a4418.tar.gz
vcpkg-af78cf0195433c34ffedb33c0cbd14e0187a4418.zip
[zydis] Update to v3.1.0 (#8426)
* [zydis] Update to v3.0.0 Since v3.0.0 now depends on the internal zycore library via a submodule, I had to replace `vcpkg_from_github` with `vcpkg_download_distfile` * [zydis] Switch to vcpkg_from_github * Update Zydis to v3.1.0 Also, set `ZYDIS_ZYCORE_PATH` instead of moving the Zycore sources.
-rw-r--r--ports/zydis/CONTROL3
-rw-r--r--ports/zydis/portfile.cmake26
2 files changed, 22 insertions, 7 deletions
diff --git a/ports/zydis/CONTROL b/ports/zydis/CONTROL
index bd4f59d95..3d50b2023 100644
--- a/ports/zydis/CONTROL
+++ b/ports/zydis/CONTROL
@@ -1,3 +1,4 @@
Source: zydis
-Version: 2.0.3
+Version: 3.1.0
+Homepage: https://zydis.re
Description: Fast and lightweight x86/x86-64 disassembler library. \ No newline at end of file
diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake
index 412cbdf87..d3dfe1216 100644
--- a/ports/zydis/portfile.cmake
+++ b/ports/zydis/portfile.cmake
@@ -1,16 +1,31 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zyantific/zydis
- REF v2.0.3
- SHA512 254aee734f93ee51a8b963404f79d6edfd0831867763243b8020c44ec2d7dd4cb7e445248df4a9af7cd2743c020674df482661d59d3278a44d2ad9a2e0611a39
+ REF bfee99f49274a0eec3ffea16ede3a5bda9cda88f
+ SHA512 de47c4a22d22e753b3d06cb6210a9df2f944b0828e49d573cadb9b0c37d590a44db74542e07eced4b0188a97b825f4990943bab1b14edfd58d80368de4299759
+ HEAD_REF master
+)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH ZYCORE_SOURCE_PATH
+ REPO zyantific/zycore-c
+ REF 3435866ecaa837376807ce934d2088ae46aa3fa3
+ SHA512 7e25254a0c17158789a3eca417cea8abe6a938cdc91cb395bd0ce1d791c8bd6b4ee0c994ca6c8372e17c03abfb3653c9053c5d56e0a4641d765c8474fae771d2
HEAD_REF master
)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ set(ZYDIS_BUILD_SHARED_LIB OFF)
+else()
+ set(ZYDIS_BUILD_SHARED_LIB ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}"
+ "-DZYDIS_ZYCORE_PATH=${ZYCORE_SOURCE_PATH}"
)
vcpkg_install_cmake()
@@ -27,5 +42,4 @@ endif()
vcpkg_copy_pdbs()
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)