diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-07-07 21:31:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 12:31:06 -0700 |
| commit | 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e (patch) | |
| tree | fafc3ca4a857223a779e39343977b72bbff0c654 /ports/proxygen | |
| parent | a1225b69e037b2f3a8dbf4a40bc4d3c957e1f865 (diff) | |
| download | vcpkg-761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e.tar.gz vcpkg-761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e.zip | |
[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
Diffstat (limited to 'ports/proxygen')
| -rw-r--r-- | ports/proxygen/CONTROL | 6 | ||||
| -rw-r--r-- | ports/proxygen/fix-duplicated-target.patch | 16 | ||||
| -rw-r--r-- | ports/proxygen/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/proxygen/remove-register.patch | 12 | ||||
| -rw-r--r-- | ports/proxygen/vcpkg.json | 23 |
5 files changed, 56 insertions, 8 deletions
diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL deleted file mode 100644 index 5b660c3df..000000000 --- a/ports/proxygen/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: proxygen
-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
-Supports: !windows&!osx
diff --git a/ports/proxygen/fix-duplicated-target.patch b/ports/proxygen/fix-duplicated-target.patch new file mode 100644 index 000000000..89d32e53d --- /dev/null +++ b/ports/proxygen/fix-duplicated-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/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index abe5633e2..d2789572d 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/proxygen
- REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00
- SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2
+ REF v2021.06.14.00
+ SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19
HEAD_REF master
+ PATCHES
+ remove-register.patch
+ fix-duplicated-target.patch # fixed in master
)
vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/proxygen/remove-register.patch b/ports/proxygen/remove-register.patch new file mode 100644 index 000000000..18a930649 --- /dev/null +++ b/ports/proxygen/remove-register.patch @@ -0,0 +1,12 @@ +diff --git a/proxygen/lib/utils/gen_perfect_hash_table.sh b/proxygen/lib/utils/gen_perfect_hash_table.sh +index a870b2d67..2dec9c5a1 100755 +--- a/proxygen/lib/utils/gen_perfect_hash_table.sh ++++ b/proxygen/lib/utils/gen_perfect_hash_table.sh +@@ -35,6 +35,7 @@ function generate_perfect_hash_table { + LC_ALL=C sort -u ${1?} | awk "${6?}" - "${5?}" | \ + ${8:-gperf} -m5 -D --output-file="${7?}" + perl -p -i -e "s/\/\*FALLTHROUGH\*\//FOLLY_FALLTHROUGH;/g" "${7?}" ++ perl -p -i -e "s/register//g" "${7?}" + + # Here we delete one of the comment lines gperf adds to the top of the file. + # i.e. /* Command-line: .../gperf -m5 --output-file=... */ diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json new file mode 100644 index 000000000..2e8dd6606 --- /dev/null +++ b/ports/proxygen/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "proxygen", + "version-string": "2021.06.14.00", + "description": "It comprises the core C++ HTTP abstractions used at Facebook.", + "homepage": "https://github.com/facebook/proxygen", + "supports": "!windows", + "dependencies": [ + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "folly", + "openssl", + "wangle", + "zlib", + "zstd" + ] +} |
