Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pcre2] Update to 10.40, drop -static suffix #24505

Merged
merged 3 commits into from
May 3, 2022
Merged

[pcre2] Update to 10.40, drop -static suffix #24505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f904d38
Update to 10.40
dg0yt May 2, 2022
afc1f2c
Drop '-static' suffix for MSVC
dg0yt May 2, 2022
6c5569e
Update versions
dg0yt May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ports/pcre2/no-static-suffix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
7 changes: 4 additions & 3 deletions ports/pcre2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PhilipHazel/pcre2
REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39
SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667
REPO PCRE2Project/pcre2
REF pcre2-10.40
SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93
HEAD_REF master
PATCHES
pcre2-10.35_fix-uwp.patch
no-static-suffix.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
Expand Down
6 changes: 3 additions & 3 deletions ports/pcre2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "pcre2",
"version": "10.39",
"port-version": 2,
"version": "10.40",
"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": [
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5341,8 +5341,8 @@
"port-version": 2
},
"pcre2": {
"baseline": "10.39",
"port-version": 2
"baseline": "10.40",
"port-version": 0
},
"pdal": {
"baseline": "2.3.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcre2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "725d8f25eea7d10b24944f314db69aa8b29d4932",
"version": "10.40",
"port-version": 0
},
{
"git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8",
"version": "10.39",
Expand Down