aboutsummaryrefslogtreecommitdiff
path: root/ports/libdatrie
diff options
context:
space:
mode:
authorJohn Spaith <jspaith@windows.microsoft.com>2019-10-10 09:36:18 -0700
committerJohn Spaith <jspaith@windows.microsoft.com>2019-10-10 09:36:18 -0700
commit17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch)
tree7baa6f699aa57601dbba4ace876fad45958878fc /ports/libdatrie
parent1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff)
parent2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff)
downloadvcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz
vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip
Merge from master
Diffstat (limited to 'ports/libdatrie')
-rw-r--r--ports/libdatrie/CONTROL2
-rw-r--r--ports/libdatrie/portfile.cmake9
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL
index 587063ec5..ddcdf9972 100644
--- a/ports/libdatrie/CONTROL
+++ b/ports/libdatrie/CONTROL
@@ -1,5 +1,5 @@
Source: libdatrie
-Version: 0.2.10-2
+Version: 0.2.10-3
Homepage: https://linux.thai.net/pub/ThaiLinux/software/libthai
Description: implementation of double-array structure for representing trie
Build-Depends: libiconv
diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake
index f7fefd248..74b8bbd80 100644
--- a/ports/libdatrie/portfile.cmake
+++ b/ports/libdatrie/portfile.cmake
@@ -2,17 +2,16 @@ set(LIBDATRIE_VERSION 0.2.10)
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libdatrie-${LIBDATRIE_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${LIBDATRIE_VERSION}.tar.xz"
FILENAME "libdatrie-${LIBDATRIE_VERSION}.tar.xz"
SHA512 ee68ded9d6e06c562da462d42e7e56098a82478d7b8547506200c3018b72536c4037a4e518924f779dc77d3ab139d93216bdb29ab4116b9dc9efd1a5d1eb9e31
)
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES
+vcpkg_extract_source_archive_ex(
+ ARCHIVE ${ARCHIVE}
+ OUT_SOURCE_PATH SOURCE_PATH
+ PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-trietool.patch"
)