diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libpopt | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-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/libpopt')
| -rw-r--r-- | ports/libpopt/0004-vcpkg-fixmsvc.patch (renamed from ports/libpopt/patches/0004-vcpkg-fixmsvc.patch) | 0 | ||||
| -rw-r--r-- | ports/libpopt/CMakeLists.txt (renamed from ports/libpopt/cmake/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | ports/libpopt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpopt/config.h.cmake (renamed from ports/libpopt/cmake/config.h.cmake) | 0 | ||||
| -rw-r--r-- | ports/libpopt/popt.def (renamed from ports/libpopt/cmake/popt.def) | 0 | ||||
| -rw-r--r-- | ports/libpopt/portfile.cmake | 16 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ports/libpopt/patches/0004-vcpkg-fixmsvc.patch b/ports/libpopt/0004-vcpkg-fixmsvc.patch index d9bc082f3..d9bc082f3 100644 --- a/ports/libpopt/patches/0004-vcpkg-fixmsvc.patch +++ b/ports/libpopt/0004-vcpkg-fixmsvc.patch diff --git a/ports/libpopt/cmake/CMakeLists.txt b/ports/libpopt/CMakeLists.txt index 84afc160d..84afc160d 100644 --- a/ports/libpopt/cmake/CMakeLists.txt +++ b/ports/libpopt/CMakeLists.txt diff --git a/ports/libpopt/CONTROL b/ports/libpopt/CONTROL index 5ba1451b6..70cf3dae9 100644 --- a/ports/libpopt/CONTROL +++ b/ports/libpopt/CONTROL @@ -1,3 +1,3 @@ Source: libpopt -Version: 1.16-10~vcpkg1-1 +Version: 1.16-11 Description: Library for parsing command line parameters diff --git a/ports/libpopt/cmake/config.h.cmake b/ports/libpopt/config.h.cmake index f641fc73c..f641fc73c 100644 --- a/ports/libpopt/cmake/config.h.cmake +++ b/ports/libpopt/config.h.cmake diff --git a/ports/libpopt/cmake/popt.def b/ports/libpopt/popt.def index 20bb70a18..20bb70a18 100644 --- a/ports/libpopt/cmake/popt.def +++ b/ports/libpopt/popt.def diff --git a/ports/libpopt/portfile.cmake b/ports/libpopt/portfile.cmake index ba50135d6..95970e78e 100644 --- a/ports/libpopt/portfile.cmake +++ b/ports/libpopt/portfile.cmake @@ -2,7 +2,6 @@ include(vcpkg_common_functions) set(LIBPOPT_VERSION 1.16) set(LIBPOPT_HASH bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/popt-${LIBPOPT_VERSION}) vcpkg_download_distfile(ARCHIVE URLS @@ -11,16 +10,17 @@ vcpkg_download_distfile(ARCHIVE FILENAME "popt-${LIBPOPT_VERSION}.tar.gz" SHA512 ${LIBPOPT_HASH} ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/patches/0004-vcpkg-fixmsvc.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0004-vcpkg-fixmsvc.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/config.h.cmake DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/popt.def DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/popt.def DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |