diff options
| author | Mikhail Paulyshka <me@mixaill.tk> | 2017-12-28 16:20:38 +0300 |
|---|---|---|
| committer | Mikhail Paulyshka <me@mixaill.tk> | 2017-12-28 16:20:38 +0300 |
| commit | 3aa16aeece48b44562647eef1c8e150069d74ef8 (patch) | |
| tree | be68cac16bd189b58b0bfd650ed434a8e96264a2 | |
| parent | cd6fb55cd9411a0b420ff7fae8a0c23d43ee6882 (diff) | |
| download | vcpkg-3aa16aeece48b44562647eef1c8e150069d74ef8.tar.gz vcpkg-3aa16aeece48b44562647eef1c8e150069d74ef8.zip | |
[libdatrie] fix trietool for MSVC runtime
| -rw-r--r-- | ports/libdatrie/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libdatrie/fix-exports.patch | 4 | ||||
| -rw-r--r-- | ports/libdatrie/fix-trietool.patch | 31 | ||||
| -rw-r--r-- | ports/libdatrie/portfile.cmake | 6 |
4 files changed, 38 insertions, 5 deletions
diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL index b39710141..8b9747fd7 100644 --- a/ports/libdatrie/CONTROL +++ b/ports/libdatrie/CONTROL @@ -1,4 +1,4 @@ Source: libdatrie -Version: 0.2.10-1 +Version: 0.2.10-2 Description: implementation of double-array structure for representing trie Build-Depends: libiconv diff --git a/ports/libdatrie/fix-exports.patch b/ports/libdatrie/fix-exports.patch index d82850431..3c407c21b 100644 --- a/ports/libdatrie/fix-exports.patch +++ b/ports/libdatrie/fix-exports.patch @@ -1,6 +1,6 @@ diff -Naur ./a/libdatrie.def ./b/libdatrie.def ---- a/libdatrie.def 2013-10-17 06:27:57.000000000 +0300 -+++ b/libdatrie.def 2017-12-21 02:42:39.873879000 +0300 +--- a/datrie/libdatrie.def 2013-10-17 06:27:57.000000000 +0300 ++++ b/datrie/libdatrie.def 2017-12-21 02:42:39.873879000 +0300 @@ -1,3 +1,4 @@ +EXPORTS alpha_map_new diff --git a/ports/libdatrie/fix-trietool.patch b/ports/libdatrie/fix-trietool.patch new file mode 100644 index 000000000..bcecee26e --- /dev/null +++ b/ports/libdatrie/fix-trietool.patch @@ -0,0 +1,31 @@ +From 086a76ad7c17060d504371ea724cf5d651d43eb3 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka <me@mixaill.tk> +Date: Thu, 28 Dec 2017 16:07:51 +0300 +Subject: [PATCH] fix trietool for MSVC runtime + +--- + tools/trietool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/trietool.c b/tools/trietool.c +index 4cfde2a..7c90905 100644 +--- a/tools/trietool.c ++++ b/tools/trietool.c +@@ -589,12 +589,12 @@ string_trim (char *s) + char *p; + + /* skip leading white spaces */ +- while (*s && isspace (*s)) ++ while (*s && isspace ((unsigned char)*s)) + ++s; + + /* trim trailing white spaces */ + p = s + strlen (s) - 1; +- while (isspace (*p)) ++ while (isspace ((unsigned char)*p)) + --p; + *++p = '\0'; + +-- +2.14.1.windows.1 + diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index 81ff4e239..f7fefd248 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -11,8 +11,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH}/datrie - PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch" + SOURCE_PATH ${SOURCE_PATH} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-trietool.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) |