[libdatrie] fix trietool for MSVC runtime

This commit is contained in:
Mikhail Paulyshka 2017-12-28 16:20:38 +03:00
parent cd6fb55cd9
commit 3aa16aeece
4 changed files with 38 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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})