aboutsummaryrefslogtreecommitdiff
path: root/ports/fizz
diff options
context:
space:
mode:
Diffstat (limited to 'ports/fizz')
-rw-r--r--ports/fizz/CONTROL2
-rw-r--r--ports/fizz/depend-zlib.patch20
-rw-r--r--ports/fizz/find-zlib.patch14
-rw-r--r--ports/fizz/portfile.cmake13
4 files changed, 24 insertions, 25 deletions
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index 9456fdb71..b5c027cda 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,4 +1,4 @@
Source: fizz
-Version: 2019.01.14.00
+Version: 2019.05.13.00
Build-Depends: folly, openssl, libsodium, zlib
Description: a TLS 1.3 implementation by Facebook
diff --git a/ports/fizz/depend-zlib.patch b/ports/fizz/depend-zlib.patch
deleted file mode 100644
index 6e574b62e..000000000
--- a/ports/fizz/depend-zlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index ab3b48f..c84890e 100644
---- a/fizz/CMakeLists.txt
-+++ b/fizz/CMakeLists.txt
-@@ -35,6 +35,7 @@ endif()
-
- find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
- find_package(OpenSSL REQUIRED)
-+find_package(ZLIB REQUIRED)
- find_package(Glog REQUIRED)
- find_package(Gflags REQUIRED)
- find_package(Libevent REQUIRED)
-@@ -169,6 +170,7 @@ target_link_libraries(fizz
- ${FOLLY_LIBRARIES}
- ${Boost_LIBRARIES}
- ${OPENSSL_LIBRARIES}
-+ ${ZLIB_LIBRARIES}
- # Don't use the sodium target here because it will break clients that
- # consume fizz's exported targets (fizz-targets.cmake) since the sodium
- # target is not exported.
diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch
new file mode 100644
index 000000000..34e93168e
--- /dev/null
+++ b/ports/fizz/find-zlib.patch
@@ -0,0 +1,14 @@
+diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 0c95883..52585aa 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -86,6 +86,9 @@ else()
+ list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+ endif()
+
++find_package(ZLIB REQUIRED)
++list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
++
+ set(FIZZ_HEADER_DIRS
+ base
+ client
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index add950fe3..3ebe020a9 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -5,10 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
- REF v2019.01.14.00
- SHA512 9182e5e6eb795842fdc536adaae9aeae7ddd17a34776bda303015dbac95c95a1ceb42ea77c3b69c1018a9ea33bbd469fd23955ac7efcc2bfcc84e899c89b5981
+ REF v2019.05.13.00
+ SHA512 f1ce2a74ad0c06fb29b37bf02dce832ffc6581723e92f11bfde075307cb0d0e2000e686e48f2f77f07a8abc425a61c2621b7d1211551ee93867cb042f1100598
HEAD_REF master
- PATCHES depend-zlib.patch
+ PATCHES find-zlib.patch
)
# Prefer installed config files
@@ -23,6 +23,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DBUILD_TESTS=OFF
+ -DBUILD_EXAMPLES=OFF
-DINCLUDE_INSTALL_DIR:STRING=include
)
@@ -32,7 +33,11 @@ vcpkg_copy_pdbs()
file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents)
string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake
+"include(CMakeFindDependencyMacro)
+find_dependency(folly CONFIG)
+find_dependency(ZLIB)
+${_contents}")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include