Merge branch 'master' into sx-init

5 files changed, 15 insertions, 57 deletions

diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 9b1b4d3e0..2597d8afd 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
 Source: wangle

-Version: 2019.01.07.00-2

-Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion

+Version: 2019.05.20.00-1

+Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context

 Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.

diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
index 3a7698218..13b85b037 100644
--- a/ports/wangle/build.patch
+++ b/ports/wangle/build.patch
@@ -1,24 +1,8 @@
 diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
-index dd348b0..4e84a15 100644
+index 15dc8b6..ed8c79b 100644
 --- a/wangle/CMakeLists.txt
 +++ b/wangle/CMakeLists.txt
-@@ -39,11 +39,12 @@ endif()
- find_package(fizz CONFIG REQUIRED)
- find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
- find_package(OpenSSL REQUIRED)
--find_package(Glog REQUIRED)
--find_package(Gflags REQUIRED)
--find_package(Libevent REQUIRED)
-+find_package(Glog CONFIG REQUIRED)
-+find_package(Gflags CONFIG REQUIRED)
-+find_package(Libevent CONFIG REQUIRED)
- find_package(DoubleConversion REQUIRED)
- find_package(Threads REQUIRED)
-+find_package(ZLIB REQUIRED)
- if (UNIX AND NOT APPLE)
-   find_package(Librt)
- endif()
-@@ -124,6 +125,7 @@ target_include_directories(
+@@ -123,6 +123,7 @@ target_include_directories(
    PUBLIC
      $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
      $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch
deleted file mode 100644
index 20921c72c..000000000
--- a/ports/wangle/gflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/wangle/cmake/FindGflags.cmake b/wangle/cmake/FindGflags.cmake

-index 0243aa3..be3780f 100644

---- a/wangle/cmake/FindGflags.cmake

-+++ b/wangle/cmake/FindGflags.cmake

-@@ -7,19 +7,11 @@

- 

- include(FindPackageHandleStandardArgs)

- 

--find_library(GFLAGS_LIBRARY gflags

--  PATHS ${GFLAGS_LIBRARYDIR})

-+find_package(gflags CONFIG REQUIRED)

- 

--find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h

--  PATHS ${GFLAGS_INCLUDEDIR})

--

--find_package_handle_standard_args(gflags DEFAULT_MSG

--  GFLAGS_LIBRARY

--  GFLAGS_INCLUDE_DIR)

--

--mark_as_advanced(

--  GFLAGS_LIBRARY

--  GFLAGS_INCLUDE_DIR)

--

--set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})

--set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})

-+if(TARGET gflags_static)

-+  set(GFLAGS_LIBRARIES gflags_static)

-+else()

-+  set(GFLAGS_LIBRARIES gflags_shared)

-+endif()

-+set(GFLAGS_INCLUDE_DIRS)

diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
index b9761c633..2ae73025a 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -5,12 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO facebook/wangle

-    REF v2019.01.07.00

-    SHA512 1b4771d92b45fd5e9622985321cfd608510ea13d2f4cb03a4842c52d7253a1b460f825746a315ef0df3b2e37e56abddb5b493b80d383ba327fdbf7294bae193e

+    REF 19300a75c27759339c44cf06ecedf7ab00703e8b

+    SHA512 cc9a5a956862e9d4321df7c0394fbb877c5f0b0f8eae1da6aad88239a2cc0b4cd694bd25e0f70f3da8a24c34f4f035bcfb53919fd99634219e0816c78477cee2

     HEAD_REF master

     PATCHES

         build.patch

-        gflags.patch

         fix-config-cmake.patch

 )

 # message(FATAL_ERROR "patch")

@@ -20,14 +19,21 @@ vcpkg_configure_cmake(
     PREFER_NINJA

     OPTIONS

         -DBUILD_TESTS=OFF

+        -DBUILD_EXAMPLES=OFF

         -DINCLUDE_INSTALL_DIR:STRING=include

 )

 

 vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle")

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wangle)

+

+file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents)

+STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")

+STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")

+file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}")

+

 vcpkg_copy_pdbs()

 

-file(REMOVE_RECURSE 

+file(REMOVE_RECURSE

     ${CURRENT_PACKAGES_DIR}/debug/include

     ${CURRENT_PACKAGES_DIR}/include/wangle/util/test

     ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs

diff --git a/ports/wangle/usage b/ports/wangle/usage
index 768ff2d64..50903e726 100644
--- a/ports/wangle/usage
+++ b/ports/wangle/usage
@@ -2,4 +2,3 @@ The package wangle is compatible with built-in CMake targets:
 
     find_package(wangle REQUIRED)
     target_link_libraries(main PRIVATE wangle::wangle)
-    target_include_directories(main PRIVATE ${WANGLE_INCLUDE_DIR})