diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-10-12 05:23:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 20:23:56 -0700 |
| commit | 5c1b068f0f481e220a489f59f04ef863714b8264 (patch) | |
| tree | 3392b6b73f6dc8ae015b792048a896e5ace31470 | |
| parent | 516920d30dbbd4bb330cdbdc7d29c8507000e4d4 (diff) | |
| download | vcpkg-5c1b068f0f481e220a489f59f04ef863714b8264.tar.gz vcpkg-5c1b068f0f481e220a489f59f04ef863714b8264.zip | |
[oniguruma] Update to 6.9.7.1 (#20642)
* Update oniguruma to 6.9.7.1
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
| -rw-r--r-- | ports/oniguruma/fix-uwp.patch | 7 | ||||
| -rw-r--r-- | ports/oniguruma/portfile.cmake | 31 | ||||
| -rw-r--r-- | ports/oniguruma/vcpkg.json | 13 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/oniguruma.json | 5 |
5 files changed, 39 insertions, 21 deletions
diff --git a/ports/oniguruma/fix-uwp.patch b/ports/oniguruma/fix-uwp.patch index 5f3fb51e9..5a2f801d1 100644 --- a/ports/oniguruma/fix-uwp.patch +++ b/ports/oniguruma/fix-uwp.patch @@ -1,5 +1,4 @@ diff --git a/src/regcomp.c b/src/regcomp.c -index 69d4b95..380f441 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -3880,7 +3880,7 @@ reduce_string_list(Node* node) @@ -18,9 +17,9 @@ index ce498c6..6848c0f 100644 @@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set, { int r, n, i; - UChar *s, *prev; -- UChar *low, *high, *low_prev; -+ UChar *low, *high, *low_prev = NULL; + UChar *s; +- UChar *low, *high; ++ UChar *low, *high = NULL; UChar* sch_range; regex_t* reg; OnigEncoding enc; diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index aa19762cb..d1089e8af 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kkos/oniguruma
- REF e03900b038a274ee2f1341039e9003875c11e47d # v6.9.4
- SHA512 77772e3994acbdde86a7405d24423fff101061e24cc8cd85975d3ab092935fc91c0c3b991fe2fa9e9a857b5254db7d923256cdb29a2e2d8a3cdd41837ed690f6
+ REF v6.9.7.1 + SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479 HEAD_REF master
PATCHES fix-uwp.patch
)
@@ -12,36 +12,41 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "non-posix" ENABLE_POSIX_API
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+ set(MSVC_STATIC_RUNTIME ON)
+else()
+ set(MSVC_STATIC_RUNTIME OFF)
+endif()
+
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
+ -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/include
- ${CURRENT_PACKAGES_DIR}/debug/share
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/debug/share"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h
+ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h"
"#if defined(ONIGURUMA_EXPORT)"
"#if 0 // defined(ONIGURUMA_EXPORT)"
)
else()
# oniguruma.h uses `\n` as line break.
- vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h
+ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h"
"#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)"
"#if 0\n#if defined(_WIN32) && !defined(__GNUC__)"
)
endif()
-# Handle copyright
-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)
diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json index 8b73eea8d..a0211d3c8 100644 --- a/ports/oniguruma/vcpkg.json +++ b/ports/oniguruma/vcpkg.json @@ -1,9 +1,18 @@ { "name": "oniguruma", - "version-string": "6.9.4", - "port-version": 1, + "version": "6.9.7.1", "description": "Modern and flexible regular expressions library", "homepage": "https://github.com/kkos/oniguruma", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "non-posix": { "description": "Disable POSIX API" diff --git a/versions/baseline.json b/versions/baseline.json index a4b7ca0dd..cd1e884a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4757,8 +4757,8 @@ "port-version": 0 }, "oniguruma": { - "baseline": "6.9.4", - "port-version": 1 + "baseline": "6.9.7.1", + "port-version": 0 }, "onnx": { "baseline": "1.9.0", diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json index c81566eec..36bf67599 100644 --- a/versions/o-/oniguruma.json +++ b/versions/o-/oniguruma.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9f6ae35330e50d5e767e67141441506c26a832fb", + "version": "6.9.7.1", + "port-version": 0 + }, + { "git-tree": "5bdcd32cc762467cca4b13b2ed11e6dd5c515cf8", "version-string": "6.9.4", "port-version": 1 |