Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[boost] update to 1.76.0 #17335

Merged
merged 23 commits into from
Jul 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ffa76bf
[boost] update generator script for boost 1.76
autoantwort May 31, 2021
e070be4
[boost] update ports to 1.76.0 (run generator)
autoantwort May 31, 2021
4e7a920
[boost] fix windows build?
autoantwort May 31, 2021
330cc3a
[quantlib] update and fix mac build
autoantwort May 31, 2021
b560fcb
[symengine] update and fix build
autoantwort May 31, 2021
1b1abc8
[avro-cpp] update to latest master and fix windows build
autoantwort May 31, 2021
4b3fa35
[folly] update to 2021.05.31.00
autoantwort May 31, 2021
aae7739
[fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build
autoantwort Jun 1, 2021
79a2884
[proxygen] update to version 2021.05.31.00
autoantwort Jun 1, 2021
e48a152
[fizz, proxygen, fbthrift] fix sodium target
autoantwort Jun 2, 2021
6cb4072
[proxygen] also works on macOS
autoantwort Jun 2, 2021
da8bcc7
[quantlib] use fix from upstream to fix mac build
autoantwort Jun 9, 2021
0f0c480
[symengine] minimize patch file and fix deprecation warning
autoantwort Jun 9, 2021
7ae4542
[folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00
autoantwort Jun 15, 2021
5b0aba9
[fbthrift] remove unnecessary dependency rsocket
autoantwort Jun 17, 2021
f779532
[fizz,fbthrift] fix zlib dependency
autoantwort Jun 19, 2021
0f86424
[fbthrift] pass required flex executable to cmake configure
autoantwort Jun 19, 2021
00b5410
add version files
autoantwort Jun 21, 2021
2755153
[boost] generate-ports.ps1: Apply code review
autoantwort Jul 5, 2021
59864d7
[boost] changes from new version of generate-ports script
autoantwort Jul 5, 2021
d82dac4
update version files
autoantwort Jul 5, 2021
6e12db0
[boost] generate-ports.ps1: Apply code review
autoantwort Jul 6, 2021
8af11c9
Merge branch 'master' into boost-1.76.0
autoantwort Jul 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 0 additions & 10 deletions ports/avro-cpp/CONTROL

This file was deleted.

33 changes: 33 additions & 0 deletions ports/avro-cpp/fix-windows-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/lang/c++/impl/avrogencpp.cc b/lang/c++/impl/avrogencpp.cc
index 61570413..0b6b35a2 100644
--- a/lang/c++/impl/avrogencpp.cc
+++ b/lang/c++/impl/avrogencpp.cc
@@ -804,8 +804,8 @@ static string readGuard(const string &filename) {

int main(int argc, char **argv) {
const string NS("namespace");
- const string OUT("output");
- const string IN("input");
+ const string OUT_FILE("output");
+ const string IN_FILE("input");
const string INCLUDE_PREFIX("include-prefix");
const string NO_UNION_TYPEDEF("no-union-typedef");

@@ -817,14 +817,14 @@ int main(int argc, char **argv) {
po::store(po::parse_command_line(argc, argv, desc), vm);
po::notify(vm);

- if (vm.count("help") || vm.count(IN) == 0 || vm.count(OUT) == 0) {
+ if (vm.count("help") || vm.count(IN_FILE) == 0 || vm.count(OUT_FILE) == 0) {
std::cout << desc << std::endl;
return 1;
}

string ns = vm.count(NS) > 0 ? vm[NS].as<string>() : string();
- string outf = vm.count(OUT) > 0 ? vm[OUT].as<string>() : string();
- string inf = vm.count(IN) > 0 ? vm[IN].as<string>() : string();
+ string outf = vm.count(OUT_FILE) > 0 ? vm[OUT_FILE].as<string>() : string();
+ string inf = vm.count(IN_FILE) > 0 ? vm[IN_FILE].as<string>() : string();
string incPrefix = vm[INCLUDE_PREFIX].as<string>();
bool noUnion = vm.count(NO_UNION_TYPEDEF) != 0;
if (incPrefix == "-") {
22 changes: 14 additions & 8 deletions ports/avro-cpp/install.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
index 30a5d66..f7f2b94 100644
index bf764ce4..e84524d0 100644
--- a/lang/c++/CMakeLists.txt
+++ b/lang/c++/CMakeLists.txt
@@ -40,6 +40,8 @@ set (AVRO_VERSION_MINOR "0")
@@ -48,6 +48,8 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
project (Avro-cpp)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})

Expand All @@ -11,12 +11,13 @@ index 30a5d66..f7f2b94 100644
if (WIN32 AND NOT CYGWIN AND NOT MSYS)
add_definitions (/EHa)
add_definitions (
@@ -118,11 +120,11 @@ set_target_properties (avrocpp PROPERTIES
@@ -125,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES
set_target_properties (avrocpp_s PROPERTIES
VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR})
VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})

-target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
+target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})

add_executable (precompile test/precompile.cc)

Expand All @@ -25,13 +26,12 @@ index 30a5d66..f7f2b94 100644

macro (gen file ns)
add_custom_command (OUTPUT ${file}.hh
@@ -151,34 +153,40 @@ gen (crossref cr)
gen (primitivetypes pt)
@@ -160,37 +162,42 @@ gen (primitivetypes pt)
gen (cpp_reserved_words cppres)

add_executable (avrogencpp impl/avrogencpp.cc)
-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
+target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+

-enable_testing()
+if(BUILD_TESTING)
Expand All @@ -57,6 +57,9 @@ index 30a5d66..f7f2b94 100644
-unittest (JsonTests)
-unittest (AvrogencppTests)
-unittest (CompilerTests)
-unittest (AvrogencppTestReservedWords)
-
-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
-
-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
- tweet_hh
Expand All @@ -75,6 +78,9 @@ index 30a5d66..f7f2b94 100644
+ unittest (JsonTests)
+ unittest (AvrogencppTests)
+ unittest (CompilerTests)
+ unittest (AvrogencppTestReservedWords)
+
+ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
+
+ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
+ tweet_hh
Expand All @@ -86,7 +92,7 @@ index 30a5d66..f7f2b94 100644

include (InstallRequiredSystemLibraries)

@@ -189,9 +197,9 @@ include (CPack)
@@ -201,9 +208,9 @@ include (CPack)
install (TARGETS avrocpp avrocpp_s
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
Expand Down
5 changes: 3 additions & 2 deletions ports/avro-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/avro
REF release-1.9.2
SHA512 6a6980901eea964c050eb3d61fadf28712e2f02c36985bf8e5176b668bba48985f6a666554a1964435448de29b18d790ab86b787d0288a22fd9cba00746a7846
REF 2ab8fa85d05f04387bd5d63b10ad1c8fd2243616
SHA512 fd21f0919b0e5e884bdf4d66c4d5ba056f04c426b309ec0b5ab26642a5f6b00d46f4dd965431b10130bc5f0d81699e2195780e90e127f63049ee5763403ef7c8
HEAD_REF master
PATCHES
install.patch
fix-windows-build.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
30 changes: 30 additions & 0 deletions ports/avro-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "avro-cpp",
"version-date": "2021-06-01",
"description": "Apache Avro is a data serialization system",
"homepage": "https://github.com/apache/avro",
"supports": "!(windows & static)",
"dependencies": [
"boost-crc",
"boost-filesystem",
"boost-format",
"boost-iostreams",
"boost-program-options",
"boost-random",
"boost-test",
"boost-thread",
"bzip2",
"liblzma",
"libzip",
"zlib",
"zstd"
],
"features": {
"snappy": {
"description": "Support Snappy for compression",
"dependencies": [
"snappy"
]
}
}
}
4 changes: 2 additions & 2 deletions ports/boost-accumulators/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/accumulators
REF boost-1.75.0
SHA512 1ac43f8a6df1d184261a022c37ffefe9db505e1cc3d4f17cf7ffdf42648d79ebc55653ed299089ff4cf56ccfb90ca565a71fef81735805ef435ac858cf65fae4
REF boost-1.76.0
SHA512 51c5a64ec68274c77a674dfa15b106df2a341018498501a882d1fbeddcdee40944422184cf102986ce5c5fb1e7e5bf388566f94893a2bb6da98ec666fa20287d
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-accumulators/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-accumulators",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost accumulators module",
"homepage": "https://github.com/boostorg/accumulators",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-algorithm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/algorithm
REF boost-1.75.0
SHA512 6ae80682fcd31caf4dc593f60df6b0c6c26688e2d8aa39277077c29556ae7c4a314cd9037b4d36464ddd3ce28350aa6691e4343617220aae813f98f25611af1a
REF boost-1.76.0
SHA512 1a421f88244e07de254ea8f050e74ed0b0de889ea7a39d95daaf1f55ec5455d9dc7bcb3ae55970885dc6cd5ac6b5f9637146420eadcc59a12fc2753c842207c3
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-algorithm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-algorithm",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost algorithm module",
"homepage": "https://github.com/boostorg/algorithm",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-align/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/align
REF boost-1.75.0
SHA512 51d138b368a565ecdd9484a333eb0e1a97a23606d3e195ac3a3aa6f64f9b028f1c2abdfa4b28bc49e11044f8f73692a5d86b5591e8ecaf7aa292a0892361a132
REF boost-1.76.0
SHA512 5b9f646512a79c7848989b5d9c2d1e67b3db86cc751d2e1034969412715c7d27a7558ecfececcad3db3ddb49a9b4ca664c9ae844f3e57b32d443549968e2ac9b
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-align/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-align",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost align module",
"homepage": "https://github.com/boostorg/align",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-any/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/any
REF boost-1.75.0
SHA512 426c4c1b47f86e1637514be45ad60ff2df40c91012c275819a2817ec0edd3fa6de107a16fbdc2cdd3d51d50fa76232f6bfc6b80a963e2fc60e94dd464a7994be
REF boost-1.76.0
SHA512 38f0bf6dddcdf5ce5527d068057de1ce9594605d51dde8f1591decb6423a912be2047fd2ed1b77acf42eb22d5e44a29276db9e9a24fad1596c589a58354307ba
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-any/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-any",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost any module",
"homepage": "https://github.com/boostorg/any",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-array/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/array
REF boost-1.75.0
SHA512 0ba02e3b084cb7c334d9709ea12d1408461d0ff0b32b35e69869d0cd81e30bd3ab06c2941fa16b51194d5961648d7283e15ebd0d8c8b843d7491a4470e72dd53
REF boost-1.76.0
SHA512 76109a4c45ba9ec880fd419cb6287ffc7f78b141c3b42f8ac934317093fbb632376381895863fa874187252e3047cd9cf4501f3fef04b559fb90a66e3b6acb50
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-array/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-array",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost array module",
"homepage": "https://github.com/boostorg/array",
"dependencies": [
Expand Down
13 changes: 0 additions & 13 deletions ports/boost-asio/inline_dummy_return.patch

This file was deleted.

8 changes: 3 additions & 5 deletions ports/boost-asio/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/asio
REF boost-1.75.0
SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27
REF boost-1.76.0
SHA512 d9706045510dc65dfb5d84fded39cb7bbbf44d9f1ba079efc3802962f30ba36ceb7b1610d47822348a910bbca857d0fee8ffef767921a9a75ee9565f9eb63a79
HEAD_REF master
PATCHES
windows_alloca_header.patch
inline_dummy_return.patch
PATCHES windows_alloca_header.patch
)

include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
Expand Down
5 changes: 1 addition & 4 deletions ports/boost-asio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "boost-asio",
"version-string": "1.75.0",
"port-version": 1,
"version": "1.76.0",
"description": "Boost asio module",
"homepage": "https://github.com/boostorg/asio",
"supports": "!emscripten",
Expand All @@ -10,7 +9,6 @@
"boost-assert",
"boost-bind",
"boost-chrono",
"boost-compatibility",
"boost-config",
{
"name": "boost-coroutine",
Expand All @@ -19,7 +17,6 @@
"boost-date-time",
"boost-detail",
"boost-function",
"boost-integer",
"boost-regex",
"boost-smart-ptr",
"boost-system",
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-assert/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assert
REF boost-1.75.0
SHA512 3a20f892b6f49d03e0d8488623e1cd3dff3eff708c77851007e50ad7e8bb2e80696a333da7dfa95cacc30e4ddc9f25dce061793670c9b8733df9227631501a08
REF boost-1.76.0
SHA512 bcd8d1fea358916d4ac8a707edee13bdc4b269a05f1456c3780fa525a2fe1438e8af1ca8689171da8bb3bb7ea2b02f0ed10ddc1204a5b52a885e2eebd1ba4f23
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-assert/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-assert",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost assert module",
"homepage": "https://github.com/boostorg/assert",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-assign/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assign
REF boost-1.75.0
SHA512 33c5adc9fe35b670ab9be1e68d61970e6c1ea0a870791fd446669cf501e665e615e72da5bb50a61e0e6bc6d7e695513d1bf73e91f845c5d1b47e694868da2baf
REF boost-1.76.0
SHA512 fce24fed1b909d108176ed9c52e9c8dfd53aa7eab063f99d83bf7b0d37db64494c5d47fe60bcade57d59afb4da53c50c0101c4a14316b043e5a018444ed4e34a
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-assign/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-assign",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost assign module",
"homepage": "https://github.com/boostorg/assign",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-atomic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/atomic
REF boost-1.75.0
SHA512 4045b4b9cd920854bd8a98298ba8662000bd045fe1322748c7ef0b96fdcb17ce8b55a16e3f10bc7344f37993d1c6df0720ddcc1b5b4255b54a5ca1fc29e253f1
REF boost-1.76.0
SHA512 8677c5bd03f089b75f8fac891f9d0383510096c64490936b766a94fdbfd984cd550f41e3e7dbed76372ca81ab8264d2d5fc2dcaadb87a52b4ebb7b0aa3b6feeb
HEAD_REF master
)

Expand Down
4 changes: 1 addition & 3 deletions ports/boost-atomic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "boost-atomic",
"version-string": "1.75.0",
"port-version": 1,
"version": "1.76.0",
"description": "Boost atomic module",
"homepage": "https://github.com/boostorg/atomic",
"dependencies": [
Expand All @@ -12,7 +11,6 @@
"host": true
},
"boost-config",
"boost-integer",
{
"name": "boost-modular-build-helper",
"host": true
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-beast/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/beast
REF boost-1.75.0
SHA512 c153b550610834d27e07786d9ad651429d0dea9e47e57578fccd17e463722d413259a4cfbd039a4b30a06b2bd99bd519869ff94e1029e8f22ea1c7f5d9c5ec5f
REF boost-1.76.0
SHA512 8fca87bdbd17ba7701fab6527043ff33c15b0c544b62448a2c269e4c0baab51fcedaf7f4bce746eb7a8d9390a37234aa96d0519fba7507d34656f20097a60c9e
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/boost-beast/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boost-beast",
"version-string": "1.75.0",
"version": "1.76.0",
"description": "Boost beast module",
"homepage": "https://github.com/boostorg/beast",
"supports": "!emscripten",
Expand Down
Loading