From 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 7 Jul 2021 21:31:06 +0200 Subject: [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 --- ports/avro-cpp/CONTROL | 10 ---------- ports/avro-cpp/fix-windows-build.patch | 33 +++++++++++++++++++++++++++++++++ ports/avro-cpp/install.patch | 22 ++++++++++++++-------- ports/avro-cpp/portfile.cmake | 5 +++-- ports/avro-cpp/vcpkg.json | 30 ++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 20 deletions(-) delete mode 100644 ports/avro-cpp/CONTROL create mode 100644 ports/avro-cpp/fix-windows-build.patch create mode 100644 ports/avro-cpp/vcpkg.json (limited to 'ports/avro-cpp') diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL deleted file mode 100644 index 85518d757..000000000 --- a/ports/avro-cpp/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: avro-cpp -Version: 1.9.2 -Homepage: https://github.com/apache/avro -Description: Apache Avro is a data serialization system -Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd -Supports: !(windows&static) - -Feature: snappy -Build-Depends: snappy -Description: Support Snappy for compression diff --git a/ports/avro-cpp/fix-windows-build.patch b/ports/avro-cpp/fix-windows-build.patch new file mode 100644 index 000000000..b20706fdc --- /dev/null +++ b/ports/avro-cpp/fix-windows-build.patch @@ -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 outf = vm.count(OUT) > 0 ? vm[OUT].as() : string(); +- string inf = vm.count(IN) > 0 ? vm[IN].as() : string(); ++ string outf = vm.count(OUT_FILE) > 0 ? vm[OUT_FILE].as() : string(); ++ string inf = vm.count(IN_FILE) > 0 ? vm[IN_FILE].as() : string(); + string incPrefix = vm[INCLUDE_PREFIX].as(); + bool noUnion = vm.count(NO_UNION_TYPEDEF) != 0; + if (incPrefix == "-") { diff --git a/ports/avro-cpp/install.patch b/ports/avro-cpp/install.patch index 12ead2861..1035b3bf3 100644 --- a/ports/avro-cpp/install.patch +++ b/ports/avro-cpp/install.patch @@ -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}) @@ -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) @@ -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) @@ -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 @@ -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 @@ -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 diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake index 49f0af20c..43a2fd278 100644 --- a/ports/avro-cpp/portfile.cmake +++ b/ports/avro-cpp/portfile.cmake @@ -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 diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json new file mode 100644 index 000000000..72cf168bc --- /dev/null +++ b/ports/avro-cpp/vcpkg.json @@ -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" + ] + } + } +} -- cgit v1.2.3