Skip to content

[pcre2] Convert JIT to feature #31294

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

Merged
JavierMatosD merged 1 commit into from
May 11, 2023
Merged

[pcre2] Convert JIT to feature #31294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions ports/pcre2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT)

set(JIT ON)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
set(JIT OFF)
endif()
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
jit PCRE2_SUPPORT_JIT
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_STATIC_LIBS=${BUILD_STATIC}
-DPCRE2_STATIC_RUNTIME=${BUILD_STATIC_CRT}
-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
Expand Down
25 changes: 23 additions & 2 deletions ports/pcre2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pcre2",
"version": "10.40",
"port-version": 1,
"port-version": 2,
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
"homepage": "https://github.com/PCRE2Project/pcre2",
"license": "BSD-3-Clause",
Expand All @@ -19,5 +19,26 @@
"host": true
},
"zlib"
]
],
"default-features": [
"platform-default-features"
],
"features": {
"jit": {
"description": "Build JIT support",
"supports": "!emscripten"
},
"platform-default-features": {
"description": "Enable default features",
"dependencies": [
{
"name": "pcre2",
"features": [
"jit"
],
"platform": "!emscripten"
}
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6102,7 +6102,7 @@
},
"pcre2": {
"baseline": "10.40",
"port-version": 1
"port-version": 2
},
"pdal": {
"baseline": "2.4.3",
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": "533fc8ada3da33f695eb499fe8190a5e9b24a5c8",
"version": "10.40",
"port-version": 2
},
{
"git-tree": "941f187c16a9385815fd353a9b79abf55bd2a7ec",
"version": "10.40",
Expand Down