[distorm] Update to 3.5.2b (#20488)

* Update distorm to 3.5.2b

* Update CI baseline

* Fix compilation

* Update git-tree hash

* Fix ARM builds

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
chausner 2021-10-06 21:28:24 +02:00 committed by GitHub
parent e1c8bbd3c6
commit 5bb0c7fc45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 14 deletions

View File

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.8.0)
project(distorm C)
set(CMAKE_C_STANDARD 99)
if(MSVC)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
endif()
@ -16,7 +18,6 @@ add_library(distorm
src/operands.c
src/prefix.c
src/textdefs.c
src/wstring.c
)
if(BUILD_SHARED_LIBS)

View File

@ -0,0 +1,12 @@
--- a/src/textdefs.c
+++ b/src/textdefs.c
@@ -42,7 +42,8 @@
s->length = len * 2;
s->p[len * 2] = 0;
do {
- RSHORT(&s->p[i]) = RSHORT(&TextBTable[(*buf) * 2]);
+ s->p[i] = TextBTable[(*buf) * 2];
+ s->p[i + 1] = TextBTable[(*buf) * 2 + 1];
buf++;
i += 2;
} while (i < len * 2);

View File

@ -1,21 +1,22 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gdabah/distorm
REF v3.4.1
SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
REF 3.5.2b
SHA512 8AAD0C51E8D9DFAEAA069A3D4FADE4BDF87CCE464C85898B6B4888FA51A9BB6EC1221FAF32ACF59EBD047CCEB9A535B2FF93D196FD14FA834D8ECE5685417A55
HEAD_REF master
PATCHES
fix-arm-builds.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/distorm RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,6 +1,15 @@
{
"name": "distorm",
"version-string": "3.4.1",
"port-version": 1,
"description": "Powerful Disassembler Library For x86/AMD64"
"version-string": "3.5.2b",
"description": "Powerful Disassembler Library For x86/AMD64",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1829,8 +1829,8 @@
"port-version": 1
},
"distorm": {
"baseline": "3.4.1",
"port-version": 1
"baseline": "3.5.2b",
"port-version": 0
},
"dlfcn-win32": {
"baseline": "1.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "703f2fc39b6b60af3a301a3db7cbffcd95445e75",
"version-string": "3.5.2b",
"port-version": 0
},
{
"git-tree": "ac14ace119d357f555286753afa0bbced4b643e7",
"version-string": "3.4.1",