diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-11 18:53:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 18:53:43 -0700 |
| commit | 450fcabed848a7c84d2b8ca2249d500f2480f20e (patch) | |
| tree | b4e6cfe37a8a150a6262f03f8037be1e0e79b4c0 | |
| parent | 4498b6403e0ef1e441a3c4df36e45fda9b181237 (diff) | |
| parent | 44079a89fee18d826b27014156480f3919908888 (diff) | |
| download | vcpkg-450fcabed848a7c84d2b8ca2249d500f2480f20e.tar.gz vcpkg-450fcabed848a7c84d2b8ca2249d500f2480f20e.zip | |
Merge pull request #6032 from tony979/pcre-arm64
[pcre] Enable arm64-windows
| -rw-r--r-- | ports/pcre/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcre/fix-arm64-config-define.patch | 21 | ||||
| -rw-r--r-- | ports/pcre/portfile.cmake | 3 |
3 files changed, 24 insertions, 2 deletions
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 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..ac99a478b 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} |