diff options
| author | Christian Ullrich <chris@chrullrich.net> | 2017-01-16 14:43:57 +0100 |
|---|---|---|
| committer | Christian Ullrich <chris@chrullrich.net> | 2017-01-17 15:52:49 +0100 |
| commit | bc874e3db23709c54e0c32c31d9d72ff263edbcb (patch) | |
| tree | 3f895194189f6d560320508856dca8a8d9753244 | |
| parent | 60b0eb3da4db83658e1075c0b1b15cfa7f506c53 (diff) | |
| download | vcpkg-bc874e3db23709c54e0c32c31d9d72ff263edbcb.tar.gz vcpkg-bc874e3db23709c54e0c32c31d9d72ff263edbcb.zip | |
Fix Boost dynamic build.
Some of the Boost libraries build differently depending on whether
BOOST_X_DYN_LINK is defined, so this symbol must be present in the
dynamic build, and removing it as part of disabling auto-link was wrong.
Reverts half of 5a3881a0.
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 01d6e9858..0abbac659 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.62-10 +Version: 1.62-11 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 3fbd06982..0e25f34bc 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -113,6 +113,12 @@ file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_NO_LIB\n" ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp + "\n#define BOOST_ALL_DYN_LINK\n" + ) +endif() + file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") |