[pcre2]Fix uwp build failure. (#8620)

This commit is contained in:
JackBoosY 2019-10-30 14:25:56 +08:00 committed by Victor Romero
parent b9150c410f
commit 8445fcce87
3 changed files with 30 additions and 4 deletions

View File

@ -1,4 +1,4 @@
Source: pcre2
Version: 10.30-5
Version: 10.30-6
Homepage: https://pcre.org/
Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library

25
ports/pcre2/fix-uwp.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e8a164..7e8150c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -506,6 +506,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
IF(MSVC)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
+ add_compile_options(/wd4146)
ENDIF(MSVC)
SET(CMAKE_INCLUDE_CURRENT_DIR 1)
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
index 050b7e9..49925a2 100644
--- a/src/pcre2_match.c
+++ b/src/pcre2_match.c
@@ -566,7 +566,7 @@ match(PCRE2_SPTR start_eptr, PCRE2_SPTR start_ecode, PCRE2_SIZE *ovector,
heapframe *F; /* Current frame pointer */
heapframe *N = NULL; /* Temporary frame pointers */
heapframe *P = NULL;
-heapframe *assert_accept_frame; /* For passing back the frame with captures */
+heapframe *assert_accept_frame = NULL; /* For passing back the frame with captures */
PCRE2_SIZE frame_copy_size; /* Amount to copy when creating a new frame */
/* Local variables that do not need to be preserved over calls to RRMATCH(). */

View File

@ -10,7 +10,9 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES fix-space.patch
fix-arm64-config.patch)
fix-arm64-config.patch
fix-uwp.patch
)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(JIT OFF)
@ -52,5 +54,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pcre2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/pcre2/COPYING ${CURRENT_PACKAGES_DIR}/share/pcre2/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)