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/quantlib/CONTROL | 5 ----- ports/quantlib/fix-mac-build.patch | 15 ++++++++++++++ ports/quantlib/portfile.cmake | 12 +++--------- ports/quantlib/vcpkg.json | 40 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 14 deletions(-) delete mode 100644 ports/quantlib/CONTROL create mode 100644 ports/quantlib/fix-mac-build.patch create mode 100644 ports/quantlib/vcpkg.json (limited to 'ports/quantlib') diff --git a/ports/quantlib/CONTROL b/ports/quantlib/CONTROL deleted file mode 100644 index 50c006335..000000000 --- a/ports/quantlib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quantlib -Version: 2019-09-02 -Description: The QuantLib C++ library -Homepage: https://www.quantlib.org/ -Build-Depends: boost-accumulators, boost-algorithm, boost-any, boost-array, boost-assert, boost-assign, boost-atomic, boost-bind, boost-config, boost-core, boost-date-time, boost-dynamic-bitset, boost-format, boost-function, boost-functional, boost-iterator, boost-lexical-cast, boost-math, boost-multi-array, boost-multiprecision, boost-optional, boost-preprocessor, boost-random, boost-serialization, boost-signals2, boost-smart-ptr, boost-thread, boost-tuple, boost-type-traits, boost-ublas, boost-unordered, boost-utility diff --git a/ports/quantlib/fix-mac-build.patch b/ports/quantlib/fix-mac-build.patch new file mode 100644 index 000000000..a114f96e7 --- /dev/null +++ b/ports/quantlib/fix-mac-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ab08a115..2b383c1dd5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,10 @@ cmake_minimum_required() + + project(QuantLib) + ++if(APPLE AND NOT CMAKE_CXX_STANDARD) ++ set(CMAKE_CXX_STANDARD 11) ++endif() ++ + include(CTest) + include(${CMAKE_CURRENT_LIST_DIR}/cmake/quantlib.cmake) + diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 9479252ec..f7cf9b777 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF f09141b5cce9134c0bcdbaf36e81359e6ba30705 - SHA512 d4b19d33594a7072a0d90b7eac3d74fb27c526269713a9223b84c0451b1e06a58f0c98350305d68a55086d1971260ff249049112aaadea59397ec195a3291490 + REF QuantLib-v1.22 + SHA512 279c2e9273dd0fbc03d19ac19814e8a3b5544545cc1441982232f89bd313fe76b6e252dbcae8a3d146ecc4f1d1e64632ac412096b89da882ba879a66776fdb91 HEAD_REF master PATCHES disable-examples-tests.patch + fix-mac-build.patch # fixed in next release ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" USE_BOOST_DYNAMIC_LIBRARIES) @@ -14,13 +15,6 @@ set(QL_MSVC_RUNTIME ${VCPKG_LIBRARY_LINKAGE}) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -# TODO: Fix it in the upstream -vcpkg_replace_string( - "${SOURCE_PATH}/ql/userconfig.hpp" - "//# define QL_USE_STD_UNIQUE_PTR" - "# define QL_USE_STD_UNIQUE_PTR" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json new file mode 100644 index 000000000..ee732abc2 --- /dev/null +++ b/ports/quantlib/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "quantlib", + "version": "1.22", + "description": "The QuantLib C++ library", + "homepage": "https://www.quantlib.org/", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-assign", + "boost-atomic", + "boost-bind", + "boost-config", + "boost-core", + "boost-date-time", + "boost-dynamic-bitset", + "boost-format", + "boost-function", + "boost-functional", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-multi-array", + "boost-multiprecision", + "boost-optional", + "boost-preprocessor", + "boost-random", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-ublas", + "boost-unordered", + "boost-utility" + ] +} -- cgit v1.2.3