From 9b45a7b09c47f464879f0dcfd96adf4561043849 Mon Sep 17 00:00:00 2001 From: Tony Lin Date: Wed, 10 Apr 2019 09:55:52 +0000 Subject: Enable pcre:arm64-windows Update sljitConfigInternal.h for ARM64, resolve error C2375: 'FlushInstructionCache': redefinition; different linkage --- ports/pcre/fix-arm64-config-define.patch | 21 +++++++++++++++++++++ ports/pcre/portfile.cmake | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 ports/pcre/fix-arm64-config-define.patch diff --git a/ports/pcre/fix-arm64-config-define.patch b/ports/pcre/fix-arm64-config-define.patch new file mode 100644 index 000000000..d92ced46b --- /dev/null +++ b/ports/pcre/fix-arm64-config-define.patch @@ -0,0 +1,21 @@ +diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h +index 2bda29e..56ba7a6 100644 +--- a/sljit/sljitConfigInternal.h ++++ b/sljit/sljitConfigInternal.h +@@ -151,6 +151,8 @@ + #define SLJIT_CONFIG_X86_64 1 + #elif defined(_M_ARM) + #define SLJIT_CONFIG_ARM_V5 1 ++#elif defined(_M_ARM64) ++#define SLJIT_CONFIG_ARM_64 1 + #else + #define SLJIT_CONFIG_X86_32 1 + #endif +@@ -330,7 +332,6 @@ + __clear_cache((char*)(from), (char*)(to)) + #elif(_WIN32) + #pragma comment(lib, "kernel32.lib") +-uint32_t FlushInstructionCache(void *hProcess, void *lpBaseAddress, uintptr_t dwSize); + #define SLJIT_CACHE_FLUSH(from, to) \ + FlushInstructionCache(GetCurrentProcess(), (void*)(from), (uintptr_t)(to - from)); + #endif diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 5e9009ace..e8da8c29a 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -19,7 +19,8 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch) + ${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-arm64-config-define.patch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From a1d48b8191c0b696c1005bb9b60efc4ac0b7518a Mon Sep 17 00:00:00 2001 From: Tony Lin Date: Wed, 10 Apr 2019 10:01:01 +0000 Subject: Enable pcre:arm64-windows Update format --- ports/pcre/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index e8da8c29a..ac99a478b 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch ${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-arm64-config-define.patch) + ${CMAKE_CURRENT_LIST_DIR}/fix-arm64-config-define.patch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From 44079a89fee18d826b27014156480f3919908888 Mon Sep 17 00:00:00 2001 From: Tony Lin Date: Thu, 11 Apr 2019 04:41:35 +0000 Subject: Update CONTROL Bump the version in CONTROL file --- ports/pcre/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL index b230a2909..46e041be2 100644 --- a/ports/pcre/CONTROL +++ b/ports/pcre/CONTROL @@ -1,3 +1,3 @@ Source: pcre -Version: 8.41-1 +Version: 8.41-2 Description: Perl Compatible Regular Expresions -- cgit v1.2.3