Merge pull request #1440 from codicodi/pcre-8.41

[pcre] update to 8.41

5 files changed, 26 insertions, 34 deletions

diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL
index aeabb2012..6a321d5d0 100644
--- a/ports/pcre/CONTROL
+++ b/ports/pcre/CONTROL
@@ -1,3 +1,3 @@
 Source: pcre
-Version: 8.40-1
+Version: 8.41
 Description: Perl Compatible Regular Expresions
diff --git a/ports/pcre/fix-arm-config-define.patch b/ports/pcre/fix-arm-config-define.patch
index 94ca808c3..eb136a8cd 100644
--- a/ports/pcre/fix-arm-config-define.patch
+++ b/ports/pcre/fix-arm-config-define.patch
@@ -28,27 +28,33 @@ index 4dc452f..5a9827d 100644
  
  #endif
  
-diff --git "a/sljit/sljitNativeARM_32.c" "b/sljit/sljitNativeARM_32.c"
-index a756f82..86bdcbb 100644
---- "a/sljit/sljitNativeARM_32.c"
-+++ "b/sljit/sljitNativeARM_32.c"
-@@ -1798,7 +1798,8 @@ extern "C" {
+diff --git a/sljit/sljitNativeARM_32.c b/sljit/sljitNativeARM_32.c
+index 745da99..83942b0 100644
+--- a/sljit/sljitNativeARM_32.c
++++ b/sljit/sljitNativeARM_32.c
+@@ -1573,12 +1573,8 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
+ extern "C" {
+ #endif
+ 
+-#if defined(__GNUC__)
  extern unsigned int __aeabi_uidivmod(unsigned int numerator, unsigned int denominator);
  extern int __aeabi_idivmod(int numerator, int denominator);
- #else
+-#else
 -#error "Software divmod functions are needed"
-+extern unsigned int __aeabi_uidivmod(unsigned int numerator, unsigned int denominator);
-+extern int __aeabi_idivmod(int numerator, int denominator);
- #endif
+-#endif
  
  #ifdef __cplusplus
-@@ -1852,7 +1853,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
+ }
+@@ -1635,12 +1631,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
+ 			}
+ 		}
+ 
+-#if defined(__GNUC__)
  		FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM,
  			((op | 0x2) == SLJIT_DIV_UW ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod))));
- #else
+-#else
 -#error "Software divmod functions are needed"
-+		FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM,
-+			((op | 0x2) == SLJIT_DIV_UW ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod))));
- #endif
+-#endif
  
- 		if ((op >= SLJIT_DIV_UW) && (compiler->scratches >= 3)) {
+ 		if (saved_reg_count > 0) {
+ 			if (saved_reg_count >= 3) {
diff --git a/ports/pcre/fix-option-2.patch b/ports/pcre/fix-option-2.patch
index f9d8e0e5e..de78c5f16 100644
--- a/ports/pcre/fix-option-2.patch
+++ b/ports/pcre/fix-option-2.patch
@@ -17,7 +17,7 @@ index 858a34bd..d1a64570 100644
 -  OPTION(PCRE_STATIC_RUNTIME
 -	"ON=Compile against the static runtime (/MT)."
 -	OFF)
-+  add_definitions(/wd4703)
++  add_definitions(/wd4703 /wd4146 /wd4308)
 +  OPTION(PCRE_STATIC_RUNTIME "ON=Compile against the static runtime (/MT)." OFF)
    OPTION(INSTALL_MSVC_PDB
           "ON=Install .pdb files built by MSVC, if generated"
diff --git a/ports/pcre/fix-option.patch b/ports/pcre/fix-option.patch
deleted file mode 100644
index d1a2b13eb..000000000
--- a/ports/pcre/fix-option.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 42451ad..858a34b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -191,7 +191,7 @@ IF (MINGW)
- ENDIF(MINGW)
- 
- IF(MSVC)
--  OPTION(PCRE_STATIC_RUNTIME OFF CACHE BOOL
-+  OPTION(PCRE_STATIC_RUNTIME
- 	"ON=Compile against the static runtime (/MT)."
- 	OFF)
-   OPTION(INSTALL_MSVC_PDB
diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake
index f2088ef69..5e9009ace 100644
--- a/ports/pcre/portfile.cmake
+++ b/ports/pcre/portfile.cmake
@@ -6,20 +6,19 @@
 #   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
 #
 
-set(PCRE_VERSION 8.40)
+set(PCRE_VERSION 8.41)
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pcre-${PCRE_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PCRE_VERSION}.zip" 
          "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.zip"
     FILENAME "pcre-${PCRE_VERSION}.zip"
-    SHA512 121c0389a739a2a1d7d5d87e5f15167601739ddfab9eed66a1f55b5bbadadb58730208430f5ad069f9342c9a84ee1817dfa07efc802c29c84f86147714ee8eff
+    SHA512 a3fd57090a5d9ce9d608aeecd59f42f04deea5b86a5c5899bdb25b18d8ec3a89b2b52b62e325c6485a87411eb65f1421604f80c3eaa653bd7dbab05ad22795ea
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option.patch
-            ${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch
             ${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch)
 
 vcpkg_configure_cmake(