-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vcpkg baseline][pcre2] fix checksum and update to 10.39 (#21248)
* [pcre2] fix checksum * [pcre2] update to 10.39 * Set static build, format code. * version * [pcre2] Add cmake wrapper to use the generated cmake file * [unicorn-lib] Fix dependency pcre2 * version * [qt5-base] Fix dependency pcre2 * [pcre2] Fix pcre2-config.cmake * version * Re-fix pcre2-config.cmake * Revert changes about pcre-config.cmake * version * remove cmake wrapper * version * Fix static name * version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
- Loading branch information
Showing
10 changed files
with
63 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,59 @@ | ||
set(PCRE2_VERSION 10.37) | ||
set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99) | ||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO PhilipHazel/pcre2 | ||
REF pcre2-${PCRE2_VERSION} | ||
SHA512 ${EXPECTED_SHA} | ||
REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39 | ||
SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667 | ||
HEAD_REF master | ||
PATCHES | ||
pcre2-10.35_fix-uwp.patch | ||
) | ||
|
||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) | ||
|
||
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") | ||
set(JIT OFF) | ||
else() | ||
set(JIT ON) | ||
endif() | ||
|
||
vcpkg_configure_cmake( | ||
vcpkg_cmake_configure( | ||
SOURCE_PATH ${SOURCE_PATH} | ||
PREFER_NINJA | ||
OPTIONS | ||
-DBUILD_STATIC_LIBS=${BUILD_STATIC} | ||
-DPCRE2_BUILD_PCRE2_8=ON | ||
-DPCRE2_BUILD_PCRE2_16=ON | ||
-DPCRE2_BUILD_PCRE2_32=ON | ||
-DPCRE2_SUPPORT_JIT=${JIT} | ||
-DPCRE2_SUPPORT_UNICODE=ON | ||
-DPCRE2_BUILD_TESTS=OFF | ||
-DPCRE2_BUILD_PCRE2GREP=OFF) | ||
-DPCRE2_BUILD_PCRE2GREP=OFF | ||
) | ||
|
||
vcpkg_install_cmake() | ||
vcpkg_cmake_install() | ||
vcpkg_copy_pdbs() | ||
|
||
file(READ ${CURRENT_PACKAGES_DIR}/include/pcre2.h PCRE2_H) | ||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H) | ||
if(BUILD_STATIC) | ||
string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}") | ||
else() | ||
string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}") | ||
endif() | ||
file(WRITE ${CURRENT_PACKAGES_DIR}/include/pcre2.h "${PCRE2_H}") | ||
file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}") | ||
|
||
vcpkg_fixup_pkgconfig() | ||
|
||
vcpkg_copy_pdbs() | ||
# The cmake file provided by pcre2 has some problems, so don't use it for now. | ||
#vcpkg_cmake_config_fixup(CONFIG_PATH cmake) | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake") | ||
|
||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") | ||
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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/man) | ||
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) | ||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
if(BUILD_STATIC) | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") | ||
endif() | ||
|
||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
{ | ||
"name": "pcre2", | ||
"version-string": "10.37", | ||
"port-version": 1, | ||
"description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library", | ||
"homepage": "https://pcre.org/" | ||
"version": "10.39", | ||
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", | ||
"homepage": "https://github.com/PhilipHazel/pcre2", | ||
"dependencies": [ | ||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
}, | ||
{ | ||
"name": "vcpkg-cmake-config", | ||
"host": true | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters