[boost] update to 1.76.0 (#17335)

* [boost] update generator script for boost 1.76

* [boost] update ports to 1.76.0 (run generator)

* [boost] fix windows build?

* [quantlib] update and fix mac build

* [symengine] update and fix build

* [avro-cpp] update to latest master and fix windows build

* [folly] update to 2021.05.31.00

* [fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build

* [proxygen] update to version 2021.05.31.00

* [fizz, proxygen, fbthrift] fix sodium target

* [proxygen] also works on macOS

* [quantlib] use fix from upstream to fix mac build

* [symengine] minimize patch file and fix deprecation warning

* [folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00

* [fbthrift] remove unnecessary dependency rsocket

I couldn't find any information that this dependency exists. The term is used in the code, but not in the context of a dependency

* [fizz,fbthrift] fix zlib dependency

* [fbthrift] pass required flex executable to cmake configure

* add version files

* [boost] generate-ports.ps1: Apply code review

* [boost] changes from new version of generate-ports script

* update version files

* [boost] generate-ports.ps1: Apply code review

5 files changed, 148 insertions, 9 deletions

diff --git a/ports/fbthrift/CONTROL b/ports/fbthrift/CONTROL
deleted file mode 100644
index d65096382..000000000
--- a/ports/fbthrift/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: fbthrift

-Version: 2020.10.19.00

-Homepage: https://github.com/facebook/fbthrift

-Description: Facebook's branch of Apache Thrift, including a new C++ server.

-Build-Depends: openssl, zlib, fmt, gflags, glog, rsocket, fizz, folly, wangle, zstd, boost-context, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread

-Supports: x64

diff --git a/ports/fbthrift/fix-sodium-target.patch b/ports/fbthrift/fix-sodium-target.patch
new file mode 100644
index 000000000..89d32e53d
--- /dev/null
+++ b/ports/fbthrift/fix-sodium-target.patch
@@ -0,0 +1,16 @@
+diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake
+index c664ccbe3..3c3f1245c 100644
+--- a/build/fbcode_builder/CMake/FindSodium.cmake
++++ b/build/fbcode_builder/CMake/FindSodium.cmake
+@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS)
+ else()
+     set(_LIB_TYPE SHARED)
+ endif()
+-add_library(sodium ${_LIB_TYPE} IMPORTED)
++
++if(NOT TARGET sodium)
++    add_library(sodium ${_LIB_TYPE} IMPORTED)
++endif()
+ 
+ set_target_properties(sodium PROPERTIES
+     INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
diff --git a/ports/fbthrift/fix-zlib.patch b/ports/fbthrift/fix-zlib.patch
new file mode 100644
index 000000000..d9a185ad1
--- /dev/null
+++ b/ports/fbthrift/fix-zlib.patch
@@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 150671504a9..7b248a0105e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,7 +106,7 @@ if(lib_only OR build_all)
+   find_package(fizz CONFIG REQUIRED)
+   find_package(fmt CONFIG REQUIRED)
+   find_package(wangle CONFIG REQUIRED)
+-  find_package(Zlib REQUIRED)
++  find_package(ZLIB REQUIRED)
+   find_package(Zstd REQUIRED)
+   # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
+   set(THREADS_PREFER_PTHREAD_FLAG ON)
+@@ -115,7 +115,6 @@ if(lib_only OR build_all)
+     ${LIBGFLAGS_INCLUDE_DIR}
+     ${GLOG_INCLUDE_DIRS}
+     ${OPENSSL_INCLUDE_DIR}
+-    ${ZLIB_INCLUDE_DIRS}
+     ${ZSTD_INCLUDE_DIRS}
+     ${Boost_INCLUDE_DIRS}
+   )
+diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
+index 69b29b948c5..e1297ed18c3 100644
+--- a/thrift/cmake/FBThriftConfig.cmake.in
++++ b/thrift/cmake/FBThriftConfig.cmake.in
+@@ -28,6 +28,8 @@ else()
+   set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
+ endif()
+ 
++find_dependency(ZLIB REQUIRED)
++
+ if (NOT TARGET FBThrift::thriftcpp2)
+   include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake")
+ endif()
+diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake
+deleted file mode 100644
+index c15525b411f..00000000000
+--- a/thrift/cmake/FindZlib.cmake
++++ /dev/null
+@@ -1,46 +0,0 @@
+-# Copyright (c) Facebook, Inc. and its affiliates.
+-#
+-# Licensed under the Apache License, Version 2.0 (the "License");
+-# you may not use this file except in compliance with the License.
+-# You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-#
+-# - Try to find Facebook zstd library
+-# This will define
+-# ZLIB_FOUND
+-# ZLIB_INCLUDE_DIR
+-# ZLIB_LIBRARIES
+-#
+-
+-find_path(
+-  ZLIB_INCLUDE_DIRS zlib.h
+-  HINTS
+-      $ENV{ZLIB_ROOT}/include
+-      ${ZLIB_ROOT}/include
+-)
+-
+-find_library(
+-    ZLIB_LIBRARIES z zlib
+-    HINTS
+-        $ENV{ZLIB_ROOT}/lib
+-        ${ZLIB_ROOT}/lib
+-)
+-
+-# For some reason ZLIB_FOUND is never marked as TRUE
+-set(ZLIB_FOUND TRUE)
+-mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES)
+-
+-if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY)
+-    message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}")
+-endif()
+diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt
+index 681622594c9..3df0b5717db 100644
+--- a/thrift/lib/cpp/CMakeLists.txt
++++ b/thrift/lib/cpp/CMakeLists.txt
+@@ -77,8 +77,8 @@ target_link_libraries(
+     thrift-core
+     rpcmetadata
+     Folly::folly
++    ZLIB::ZLIB
+     ${OPENSSL_LIBRARIES}
+-    ${ZLIB_LIBRARIES}
+     ${ZSTD_LIBRARIES}
+ )
+ 
diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
index 62c1a7a2e..016fac181 100644
--- a/ports/fbthrift/portfile.cmake
+++ b/ports/fbthrift/portfile.cmake
@@ -6,9 +6,12 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
-    REF e184b41448dab2f462094fa005ed05269cfba3e3 # v2020.10.19.00
-    SHA512 df03e1779fd3f1868ed7be21292bcd91ae65bcca591b0265a40391dde7e3b3b81d83fe7eb4ec8dd5c440be471375b8e2c8c24befefaca3ae0cab9ce10bfd362c
+    REF v2021.06.14.00
+    SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798
     HEAD_REF master
+    PATCHES
+        fix-sodium-target.patch # fixed in master
+        fix-zlib.patch # fixed in master
 )
 
 vcpkg_configure_cmake(
@@ -16,6 +19,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DBISON_EXECUTABLE=${BISON}
+        -DFLEX_EXECUTABLE=${FLEX}
 )
 
 vcpkg_install_cmake()
@@ -41,7 +45,8 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs
     ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test
     ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test
+    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark
+    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation
 )
 
 vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN)
diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json
new file mode 100644
index 000000000..4e9237e2c
--- /dev/null
+++ b/ports/fbthrift/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "fbthrift",
+  "version-string": "2021.06.14.00",
+  "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
+  "homepage": "https://github.com/facebook/fbthrift",
+  "supports": "x64",
+  "dependencies": [
+    "boost-context",
+    "boost-filesystem",
+    "boost-program-options",
+    "boost-regex",
+    "boost-system",
+    "boost-thread",
+    "fizz",
+    "fmt",
+    "folly",
+    "gflags",
+    "glog",
+    "openssl",
+    "wangle",
+    "zlib",
+    "zstd"
+  ]
+}