diff --git a/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch b/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch new file mode 100644 index 0000000000..dd014bf6fd --- /dev/null +++ b/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c3a309..cdd480f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ FIND_PACKAGE( Editline ) + + INCLUDE(CheckIncludeFile) + INCLUDE(CheckIncludeFileCXX) +-INCLUDE(CheckFunctionExists) ++INCLUDE(CheckSymbolExists) + INCLUDE(CheckTypeSize) + INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR + +@@ -109,12 +109,12 @@ CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) + CHECK_INCLUDE_FILE_CXX(type_traits.h HAVE_TYPE_TRAITS_H) + CHECK_INCLUDE_FILE_CXX(bits/type_traits.h HAVE_BITS_TYPE_TRAITS_H) + +-CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) +-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) +-CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ) +-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64) ++CHECK_SYMBOL_EXISTS(bcopy strings.h HAVE_BCOPY) ++CHECK_SYMBOL_EXISTS(memmove strings.h HAVE_MEMMOVE) ++CHECK_SYMBOL_EXISTS(strerror strings.h HAVE_STRERROR) ++CHECK_SYMBOL_EXISTS(strtoll stdlib.h HAVE_STRTOLL) ++CHECK_SYMBOL_EXISTS(strtoq stdlib.h HAVE_STRTOQ) ++CHECK_SYMBOL_EXISTS(_strtoi64 stdlib.h HAVE__STRTOI64) + + CHECK_TYPE_SIZE("long long" LONG_LONG) + CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index b7a11172b7..ca1176fc2f 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -7,7 +7,8 @@ set(PATCHES pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch # Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600 pcre-8.45_fix_postfix_for_debug_Windows_builds.patch - export-cmake-targets.patch) + export-cmake-targets.patch + pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index 1e006173fc..4c3f8dcb4b 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre", "version": "8.45", - "port-version": 2, + "port-version": 3, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9883fff0ea..1a0356ea53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5354,7 +5354,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 2 + "port-version": 3 }, "pcre2": { "baseline": "10.40", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index 64af5b411b..acbf3b7329 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad", + "version": "8.45", + "port-version": 3 + }, { "git-tree": "693b4da6141be8041f8db0caa1b60ce246b47dcb", "version": "8.45",