Skip to content

Commit 70033db

Browse files
camuwardJackBoosY
camuward
and
JackBoosY
authored
[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>
1 parent 6cfa934 commit 70033db

10 files changed

Lines changed: 63 additions & 34 deletions

File tree

‎ports/pcre2/portfile.cmake‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,59 @@
1-
set(PCRE2_VERSION 10.37)
2-
set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99)
31
vcpkg_from_github(
42
OUT_SOURCE_PATH SOURCE_PATH
53
REPO PhilipHazel/pcre2
6-
REF pcre2-${PCRE2_VERSION}
7-
SHA512 ${EXPECTED_SHA}
4+
REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39
5+
SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667
86
HEAD_REF master
97
PATCHES
108
pcre2-10.35_fix-uwp.patch
119
)
1210

11+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
12+
1313
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
1414
set(JIT OFF)
1515
else()
1616
set(JIT ON)
1717
endif()
1818

19-
vcpkg_configure_cmake(
19+
vcpkg_cmake_configure(
2020
SOURCE_PATH ${SOURCE_PATH}
21-
PREFER_NINJA
2221
OPTIONS
22+
-DBUILD_STATIC_LIBS=${BUILD_STATIC}
2323
-DPCRE2_BUILD_PCRE2_8=ON
2424
-DPCRE2_BUILD_PCRE2_16=ON
2525
-DPCRE2_BUILD_PCRE2_32=ON
2626
-DPCRE2_SUPPORT_JIT=${JIT}
2727
-DPCRE2_SUPPORT_UNICODE=ON
2828
-DPCRE2_BUILD_TESTS=OFF
29-
-DPCRE2_BUILD_PCRE2GREP=OFF)
29+
-DPCRE2_BUILD_PCRE2GREP=OFF
30+
)
3031

31-
vcpkg_install_cmake()
32+
vcpkg_cmake_install()
33+
vcpkg_copy_pdbs()
3234

33-
file(READ ${CURRENT_PACKAGES_DIR}/include/pcre2.h PCRE2_H)
34-
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
35+
file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H)
36+
if(BUILD_STATIC)
3537
string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}")
3638
else()
3739
string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}")
3840
endif()
39-
file(WRITE ${CURRENT_PACKAGES_DIR}/include/pcre2.h "${PCRE2_H}")
41+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}")
4042

4143
vcpkg_fixup_pkgconfig()
4244

43-
vcpkg_copy_pdbs()
45+
# The cmake file provided by pcre2 has some problems, so don't use it for now.
46+
#vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
47+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake")
48+
49+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man")
50+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
51+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
52+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man")
53+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
4454

45-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/man)
46-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
47-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
48-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man)
49-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
50-
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
55+
if(BUILD_STATIC)
5156
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
5257
endif()
5358

54-
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
59+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

‎ports/pcre2/vcpkg.json‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
{
22
"name": "pcre2",
3-
"version-string": "10.37",
4-
"port-version": 1,
5-
"description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library",
6-
"homepage": "https://pcre.org/"
3+
"version": "10.39",
4+
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
5+
"homepage": "https://github.com/PhilipHazel/pcre2",
6+
"dependencies": [
7+
{
8+
"name": "vcpkg-cmake",
9+
"host": true
10+
},
11+
{
12+
"name": "vcpkg-cmake-config",
13+
"host": true
14+
}
15+
]
716
}

‎ports/qt5-base/portfile.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ endif()
171171
find_library(MYSQL_RELEASE NAMES libmysql mysqlclient PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux)
172172
find_library(MYSQL_DEBUG NAMES libmysql libmysqld mysqlclient mysqlclientd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
173173

174-
find_library(PCRE2_RELEASE NAMES pcre2-16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
175-
find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
174+
find_library(PCRE2_RELEASE NAMES pcre2-16 pcre2-16-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
175+
find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16-static pcre2-16d pcre2-16-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
176176
find_library(FREETYPE_RELEASE NAMES freetype PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #zlib, bzip2, libpng
177177
find_library(FREETYPE_DEBUG NAMES freetype freetyped PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
178178
find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)

‎ports/qt5-base/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "qt5-base",
33
"version-semver": "5.15.2",
4-
"port-version": 12,
4+
"port-version": 13,
55
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
66
"homepage": "https://www.qt.io/",
77
"dependencies": [

‎ports/unicorn-lib/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not."
77
find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp)
88
#find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities)
99
find_package(ZLIB REQUIRED)
10-
find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d HINTS ${INSTALLED_LIB_PATH})
11-
find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 HINTS ${INSTALLED_LIB_PATH})
10+
find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH})
11+
find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH})
1212
select_library_configurations(PCRE2)
1313

1414
file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp)

‎ports/unicorn-lib/vcpkg.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "unicorn-lib",
3-
"version-string": "2020-03-02",
4-
"port-version": 1,
3+
"version-date": "2020-03-02",
4+
"port-version": 2,
55
"description": "Unicode library for C++ by Ross Smith",
66
"homepage": "https://github.com/CaptainCrowbar/unicorn-lib",
77
"dependencies": [

‎versions/baseline.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5129,8 +5129,8 @@
51295129
"port-version": 1
51305130
},
51315131
"pcre2": {
5132-
"baseline": "10.37",
5133-
"port-version": 1
5132+
"baseline": "10.39",
5133+
"port-version": 0
51345134
},
51355135
"pdal": {
51365136
"baseline": "1.7.1",
@@ -5466,7 +5466,7 @@
54665466
},
54675467
"qt5-base": {
54685468
"baseline": "5.15.2",
5469-
"port-version": 12
5469+
"port-version": 13
54705470
},
54715471
"qt5-canvas3d": {
54725472
"baseline": "0",
@@ -6874,7 +6874,7 @@
68746874
},
68756875
"unicorn-lib": {
68766876
"baseline": "2020-03-02",
6877-
"port-version": 1
6877+
"port-version": 2
68786878
},
68796879
"units": {
68806880
"baseline": "2.3.1",

‎versions/p-/pcre2.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "a7adfd692604527d08dfc188301fb73bae107550",
5+
"version": "10.39",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "f467ee4e8312b3536d9b7af3a181630c9956db5d",
510
"version-string": "10.37",

‎versions/q-/qt5-base.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "d0254baec079c6226b73cc7580e7724cad98648c",
5+
"version-semver": "5.15.2",
6+
"port-version": 13
7+
},
38
{
49
"git-tree": "9a65e1b0d631a1c2879d566140c11d634601fca6",
510
"version-semver": "5.15.2",

‎versions/u-/unicorn-lib.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "e88ab2927a310295171887057ac0f6cc6502a8d5",
5+
"version-date": "2020-03-02",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "a79eb0ae5746d8c2c2ebbd68557baf5975193ac8",
510
"version-string": "2020-03-02",

0 commit comments

Comments
 (0)