aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwan BERNARD <edmBernard@users.noreply.github.com>2018-11-27 00:41:37 +0100
committerRobert Schumacher <roschuma@microsoft.com>2018-11-26 15:41:37 -0800
commit8361d177d7bfcd03b4117184483e783f22341d9a (patch)
tree48144ca5aad3f53ca2d703a3e623c4f7de034ed2
parente78a40b553e6b236e6d532686865a910e7a3ee16 (diff)
downloadvcpkg-8361d177d7bfcd03b4117184483e783f22341d9a.tar.gz
vcpkg-8361d177d7bfcd03b4117184483e783f22341d9a.zip
[zstd] update to v1.3.7 (#4785)
* [zstd] update to v1.3.7 * [zstd] Bump control version * [zstd] Disable force release mode
-rw-r--r--ports/zstd/CONTROL2
-rw-r--r--ports/zstd/enable-debug-mode.patch13
-rw-r--r--ports/zstd/portfile.cmake8
3 files changed, 19 insertions, 4 deletions
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL
index 406d67176..985c24b0c 100644
--- a/ports/zstd/CONTROL
+++ b/ports/zstd/CONTROL
@@ -1,3 +1,3 @@
Source: zstd
-Version: 1.3.4
+Version: 1.3.7-1
Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net
diff --git a/ports/zstd/enable-debug-mode.patch b/ports/zstd/enable-debug-mode.patch
new file mode 100644
index 000000000..a3e829032
--- /dev/null
+++ b/ports/zstd/enable-debug-mode.patch
@@ -0,0 +1,13 @@
+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 44a980db4..dfbb2e3f2 100644
--- a/ports/zstd/portfile.cmake
+++ b/ports/zstd/portfile.cmake
@@ -2,9 +2,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/zstd
- REF v1.3.4
- SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
- HEAD_REF dev)
+ REF v1.3.7
+ SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
+ HEAD_REF dev
+ PATCHES enable-debug-mode.patch
+)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(ZSTD_STATIC 1)