early-access version 2853
This commit is contained in:
25
externals/vcpkg/ports/oniguruma/fix-uwp.patch
vendored
Executable file
25
externals/vcpkg/ports/oniguruma/fix-uwp.patch
vendored
Executable file
@@ -0,0 +1,25 @@
|
||||
diff --git a/src/regcomp.c b/src/regcomp.c
|
||||
--- a/src/regcomp.c
|
||||
+++ b/src/regcomp.c
|
||||
@@ -3880,7 +3880,7 @@ reduce_string_list(Node* node)
|
||||
{
|
||||
Node* prev;
|
||||
Node* curr;
|
||||
- Node* prev_node;
|
||||
+ Node* prev_node = NULL;
|
||||
Node* next_node;
|
||||
|
||||
prev = NULL_NODE;
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index ce498c6..6848c0f 100644
|
||||
--- a/src/regexec.c
|
||||
+++ b/src/regexec.c
|
||||
@@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set,
|
||||
{
|
||||
int r, n, i;
|
||||
UChar *s;
|
||||
- UChar *low, *high;
|
||||
+ UChar *low, *high = NULL;
|
||||
UChar* sch_range;
|
||||
regex_t* reg;
|
||||
OnigEncoding enc;
|
||||
54
externals/vcpkg/ports/oniguruma/portfile.cmake
vendored
Executable file
54
externals/vcpkg/ports/oniguruma/portfile.cmake
vendored
Executable file
@@ -0,0 +1,54 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO kkos/oniguruma
|
||||
REF v6.9.7.1
|
||||
SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479
|
||||
HEAD_REF master
|
||||
PATCHES fix-uwp.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
INVERTED_FEATURES
|
||||
"non-posix" ENABLE_POSIX_API
|
||||
)
|
||||
|
||||
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_cmake_install()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${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"
|
||||
"#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"
|
||||
"#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)"
|
||||
"#if 0\n#if defined(_WIN32) && !defined(__GNUC__)"
|
||||
)
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
22
externals/vcpkg/ports/oniguruma/vcpkg.json
vendored
Executable file
22
externals/vcpkg/ports/oniguruma/vcpkg.json
vendored
Executable file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"name": "oniguruma",
|
||||
"version": "6.9.7.1",
|
||||
"port-version": 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"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user