diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-14 01:39:59 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-14 01:39:59 -0800 |
| commit | f06bf273971ffede4d2a8fefea0de383841cc8b7 (patch) | |
| tree | ff2f0633d7fda360a3f59d46ecbb413bf52cab2f | |
| parent | 194edb784d61bd7a7e5885260954452422d450d3 (diff) | |
| download | vcpkg-f06bf273971ffede4d2a8fefea0de383841cc8b7.tar.gz vcpkg-f06bf273971ffede4d2a8fefea0de383841cc8b7.zip | |
[bond] Boost patch is no longer needed due to toolchain improvements.
| -rw-r--r-- | ports/bond/0001_boost_static_libs.patch | 23 | ||||
| -rw-r--r-- | ports/bond/portfile.cmake | 3 |
2 files changed, 0 insertions, 26 deletions
diff --git a/ports/bond/0001_boost_static_libs.patch b/ports/bond/0001_boost_static_libs.patch deleted file mode 100644 index 99eeb712e..000000000 --- a/ports/bond/0001_boost_static_libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/Config.cmake b/cmake/Config.cmake -index b51c76a6..4cb5a6ff 100644 ---- a/cmake/Config.cmake -+++ b/cmake/Config.cmake -@@ -52,7 +52,7 @@ if (MSVC) - add_compile_options (/permissive-) - endif() - -- set (Boost_USE_STATIC_LIBS ON) -+ set (Boost_USE_STATIC_LIBS OFF) - endif (MSVC) - - if (WIN32) -@@ -137,9 +137,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++")) - endif() - endif() - --# disable Boost auto-linking --add_definitions (-DBOOST_ALL_NO_LIB) -- - # VS2015U2 fixed a bug with atomics and emits a warning without this definition. - add_definitions (-D_ENABLE_ATOMIC_ALIGNMENT_FIX) - diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 40d3a6d0a..2ad48a94d 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -30,9 +30,6 @@ endif() vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - # Change Boost_USE_STATIC_LIBS to be compatible with vcpkg's treatment - # of Boost - ${CMAKE_CURRENT_LIST_DIR}/0001_boost_static_libs.patch # Don't install rapidjson from the (empty) submodule. With vcpkg, we get # rapidjson from vcpkg ${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch |