mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[pcre2] Update to 10.40, drop -static
suffix (#24505)
* Update to 10.40 * Drop '-static' suffix for MSVC The suffix breaks pc files. Renaming allowed by maintainer guidelines, to facilitate downstream usage. * Update versions
This commit is contained in:
parent
43e3594578
commit
b98afc9f11
33
ports/pcre2/no-static-suffix.patch
Normal file
33
ports/pcre2/no-static-suffix.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index fa2181e..3bf5317 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8)
|
||||||
|
SET(targets ${targets} pcre2-posix-static)
|
||||||
|
|
||||||
|
IF(MSVC)
|
||||||
|
- SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
|
||||||
|
- SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static)
|
||||||
|
+ SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
|
||||||
|
+ SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
|
||||||
|
ELSE(MSVC)
|
||||||
|
SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
|
||||||
|
SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
|
||||||
|
@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16)
|
||||||
|
SET(targets ${targets} pcre2-16-static)
|
||||||
|
|
||||||
|
IF(MSVC)
|
||||||
|
- SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
|
||||||
|
+ SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
|
||||||
|
ELSE(MSVC)
|
||||||
|
SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
|
||||||
|
ENDIF(MSVC)
|
||||||
|
@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32)
|
||||||
|
SET(targets ${targets} pcre2-32-static)
|
||||||
|
|
||||||
|
IF(MSVC)
|
||||||
|
- SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
|
||||||
|
+ SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
|
||||||
|
ELSE(MSVC)
|
||||||
|
SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
|
||||||
|
ENDIF(MSVC)
|
@ -1,11 +1,12 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO PhilipHazel/pcre2
|
REPO PCRE2Project/pcre2
|
||||||
REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39
|
REF pcre2-10.40
|
||||||
SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667
|
SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
pcre2-10.35_fix-uwp.patch
|
pcre2-10.35_fix-uwp.patch
|
||||||
|
no-static-suffix.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "pcre2",
|
"name": "pcre2",
|
||||||
"version": "10.39",
|
"version": "10.40",
|
||||||
"port-version": 2,
|
|
||||||
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
|
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
|
||||||
"homepage": "https://github.com/PhilipHazel/pcre2",
|
"homepage": "https://github.com/PCRE2Project/pcre2",
|
||||||
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
|
@ -5341,8 +5341,8 @@
|
|||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"pcre2": {
|
"pcre2": {
|
||||||
"baseline": "10.39",
|
"baseline": "10.40",
|
||||||
"port-version": 2
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"pdal": {
|
"pdal": {
|
||||||
"baseline": "2.3.0",
|
"baseline": "2.3.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "725d8f25eea7d10b24944f314db69aa8b29d4932",
|
||||||
|
"version": "10.40",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8",
|
"git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8",
|
||||||
"version": "10.39",
|
"version": "10.39",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user