aboutsummaryrefslogtreecommitdiff
path: root/ports/lpeg
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/lpeg
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz
vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/lpeg')
-rw-r--r--ports/lpeg/CONTROL2
-rw-r--r--ports/lpeg/portfile.cmake8
2 files changed, 6 insertions, 4 deletions
diff --git a/ports/lpeg/CONTROL b/ports/lpeg/CONTROL
index c779b2888..d3abb132c 100644
--- a/ports/lpeg/CONTROL
+++ b/ports/lpeg/CONTROL
@@ -1,5 +1,5 @@
Source: lpeg
-Version: 1.0.1-3
+Version: 1.0.1-4
Homepage: https://www.inf.puc-rio.br/~roberto/lpeg
Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).
Build-Depends: lua
diff --git a/ports/lpeg/portfile.cmake b/ports/lpeg/portfile.cmake
index 43cc89d93..f37a350c3 100644
--- a/ports/lpeg/portfile.cmake
+++ b/ports/lpeg/portfile.cmake
@@ -3,14 +3,16 @@ include(vcpkg_common_functions)
set(LPEG_VER 1.0.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lpeg-${LPEG_VER})
-
vcpkg_download_distfile(ARCHIVE
URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz"
FILENAME "lpeg-${LPEG_VER}.tar.gz"
SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/lpeg.def DESTINATION ${SOURCE_PATH})