3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[pcre] fix build pcre undeclared identifier strtoq on arm-android (#24757)

Browse Source 
* [pcre] fix build pcre undeclared identifier strtoq on arm-android
* replace CHECK_FUNCTION_EXISTS by CHECK_SYMBOL_EXISTS

* Update version database
This commit is contained in:
tqcq 2022-05-19 15:22:40 +08:00 committed by GitHub
parent 8f1d60f201
commit f27af0410e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch Normal file
View File

@ -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)

3
ports/pcre/portfile.cmake
View File

@ -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

2
ports/pcre/vcpkg.json
View File

@ -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": [

2
versions/baseline.json
View File

@ -5354,7 +5354,7 @@
},
"pcre": {
"baseline": "8.45",
"port-version": 2
"port-version": 3
},
"pcre2": {
"baseline": "10.40",

5
versions/p-/pcre.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad",
"version": "8.45",
"port-version": 3
},
{
"git-tree": "693b4da6141be8041f8db0caa1b60ce246b47dcb",
"version": "8.45",