mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[zydis] fix arm64 osx build (#27326)
This commit is contained in:
parent
9ec17751eb
commit
9366f56e13
26
ports/zydis/fix-arm64-build.patch
Normal file
26
ports/zydis/fix-arm64-build.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/include/Zydis/ShortString.h b/include/Zydis/ShortString.h
|
||||
index bed45af6..566d673a 100644
|
||||
--- a/include/Zydis/ShortString.h
|
||||
+++ b/include/Zydis/ShortString.h
|
||||
@@ -45,7 +45,9 @@ extern "C" {
|
||||
/* Enums and types */
|
||||
/* ============================================================================================== */
|
||||
|
||||
-#pragma pack(push, 1)
|
||||
+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE))
|
||||
+# pragma pack(push, 1)
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* Defines the `ZydisShortString` struct.
|
||||
@@ -67,7 +69,9 @@ typedef struct ZydisShortString_
|
||||
ZyanU8 size;
|
||||
} ZydisShortString;
|
||||
|
||||
-#pragma pack(pop)
|
||||
+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE))
|
||||
+# pragma pack(pop)
|
||||
+#endif
|
||||
|
||||
/* ============================================================================================== */
|
||||
/* Macros */
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
zycore.patch
|
||||
fix-arm64-build.patch # from https://github.com/zyantific/zydis/pull/259
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "zydis",
|
||||
"version-semver": "3.2.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Fast and lightweight x86/x86-64 disassembler library.",
|
||||
"homepage": "https://zydis.re",
|
||||
"license": "MIT",
|
||||
|
@ -8218,7 +8218,7 @@
|
||||
},
|
||||
"zydis": {
|
||||
"baseline": "3.2.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"zyre": {
|
||||
"baseline": "2019-07-07",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6f44467c0fc5c106acd0846b22a6c0d3691c10de",
|
||||
"version-semver": "3.2.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "a021ff1e31fecf096d68bb9cc9aa30121f3dd0bc",
|
||||
"version-semver": "3.2.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user