diff options
| author | Wolfgang Stöggl <c72578@yahoo.de> | 2020-07-07 23:54:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 14:54:39 -0700 |
| commit | 3e615cdb1d7b6e8e4abc4308607b39e3e33f8cb9 (patch) | |
| tree | f0158afe995895e2821fe97b1291aafd7b9ba5af /ports/pcre2/fix-uwp.patch | |
| parent | aa6f70b6652002f145b72c94c5f63bcd5b455d8e (diff) | |
| download | vcpkg-3e615cdb1d7b6e8e4abc4308607b39e3e33f8cb9.tar.gz vcpkg-3e615cdb1d7b6e8e4abc4308607b39e3e33f8cb9.zip | |
[pcre2] Update to 10.35 (#11754)
- New upstream version 10.35
- Update patches:
pcre2-10.35_fix-space.patch
pcre2-10.35_fix-uwp.patch
- Add patch:
pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch
- Drop patch (fixed upstream):
fix-arm64-config.patch
- Since 10.35, pkgconfig files are created using CMake
* fix debug suffix of pkgconfig files under Windows
* add vcpkg_fixup_pkgconfig()
- Remove bin and debug/bin in case of static build
- Update ci.baseline.txt
Remove "pcre2:arm-uwp=fail", because arm-uwp passes now
Add "unicorn-lib:arm-uwp=fail"
Diffstat (limited to 'ports/pcre2/fix-uwp.patch')
| -rw-r--r-- | ports/pcre2/fix-uwp.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ports/pcre2/fix-uwp.patch b/ports/pcre2/fix-uwp.patch deleted file mode 100644 index 29aaf1a2b..000000000 --- a/ports/pcre2/fix-uwp.patch +++ /dev/null @@ -1,25 +0,0 @@ -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(). */ |
