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/zstd | |
| 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/zstd')
| -rw-r--r-- | ports/zstd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zstd/enable-debug-mode.patch | 13 | ||||
| -rw-r--r-- | ports/zstd/portfile.cmake | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index bab75367d..47cdf1eff 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,4 +1,4 @@ Source: zstd -Version: 1.4.0 +Version: 1.4.0-1 Description: Zstandard - Fast real-time compression algorithm Homepage: https://facebook.github.io/zstd/ diff --git a/ports/zstd/enable-debug-mode.patch b/ports/zstd/enable-debug-mode.patch deleted file mode 100644 index a3e829032..000000000 --- a/ports/zstd/enable-debug-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
-index 1e2921d..31fe3d5 100644
---- a/build/cmake/CMakeLists.txt
-+++ b/build/cmake/CMakeLists.txt
-@@ -12,7 +12,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
- SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-
- # Ensure Release build even if not invoked via Makefile
--SET(CMAKE_BUILD_TYPE "Release")
-+# SET(CMAKE_BUILD_TYPE "Release")
-
- LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
- INCLUDE(GNUInstallDirs)
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 4b7522c76..c8efe2812 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( REF v1.4.0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671 HEAD_REF dev - PATCHES enable-debug-mode.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") |