diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-30 19:27:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 19:27:16 -0700 |
| commit | 42450bfdfff62f6fa9330f0f9873f37689331b45 (patch) | |
| tree | ae90cacf3cb227190d2371f1f1896fcfa8d449d3 | |
| parent | 2b26822d61578bdc5b9dfafa175f3b67061f47fd (diff) | |
| parent | 72eb21a5151fc806a0e10c060253f8e3ad08b6a5 (diff) | |
| download | vcpkg-42450bfdfff62f6fa9330f0f9873f37689331b45.tar.gz vcpkg-42450bfdfff62f6fa9330f0f9873f37689331b45.zip | |
Merge pull request #1190 from codicodi/boost-dyn-link-fix
[boost] forcibly undefine BOOST_ALL_DYN_LINK in static builds
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index ec2e77ffa..964665b96 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.64-4 +Version: 1.64-5 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 79c2f02da..b8d56ee90 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -221,6 +221,9 @@ file( file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_NO_LIB\n" ) +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp + "\n#undef BOOST_ALL_DYN_LINK\n" +) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp |