[folly/fizz/wangle/proxygen/fbthrift] Update to latest revision (#13701)

3 files changed, 9 insertions, 56 deletions

diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL
index 86c5b5b7e..5b660c3df 100644
--- a/ports/proxygen/CONTROL
+++ b/ports/proxygen/CONTROL
@@ -1,5 +1,6 @@
 Source: proxygen

-Version: 2019.10.21.00

+Version: 2020.10.19.00

 Homepage: https://github.com/facebook/proxygen

-Description: It comprises the core C++ HTTP abstractions used at Facebook. 

-Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
\ No newline at end of file
+Description: It comprises the core C++ HTTP abstractions used at Facebook.

+Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread

+Supports: !windows&!osx

diff --git a/ports/proxygen/fix-tools-path.patch b/ports/proxygen/fix-tools-path.patch
deleted file mode 100644
index 2e6ab171a..000000000
--- a/ports/proxygen/fix-tools-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/proxygen/httpserver/CMakeLists.txt b/proxygen/httpserver/CMakeLists.txt
-index 40046e5..ab53b06 100644
---- a/proxygen/httpserver/CMakeLists.txt
-+++ b/proxygen/httpserver/CMakeLists.txt
-@@ -45,7 +45,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_push
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_proxy
-@@ -66,7 +66,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_proxy
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_static
-@@ -87,7 +87,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_static
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_echo
-@@ -108,7 +108,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_echo
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- if (BUILD_QUIC)
-@@ -140,7 +140,7 @@ if (BUILD_QUIC)
-   install(
-       TARGETS hq
-       EXPORT proxygen-exports
--      DESTINATION bin
-+      DESTINATION tools
-   )
- endif()
- 
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index 8624ea48a..abe5633e2 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -3,10 +3,9 @@ vcpkg_fail_port_install(ON_TARGET "Windows")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO facebook/proxygen

-    REF ac8a0f520b1d5fb91cd3f3ef681d4b37053b09f0 #v2019.10.21.00

-    SHA512 2a76fed7cf9947e1096b36d25fe7886c06655fa2faf6d4829fd07c682efdf2bd9003a4c9e4772a4ccfd72df81e7066df736d2330a5edf0e836da30dcc81d3b5f

+    REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00

+    SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2

     HEAD_REF master

-    PATCHES fix-tools-path.patch

 )

 

 vcpkg_find_acquire_program(PYTHON3)

@@ -31,9 +30,11 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 

+vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN)

+

 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen)

 vcpkg_copy_pdbs()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-#Handle copyright

+

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)