diff options
| author | Christian Ullrich <chris@chrullrich.net> | 2017-01-03 14:06:10 +0100 |
|---|---|---|
| committer | Christian Ullrich <chris@chrullrich.net> | 2017-01-03 14:06:49 +0100 |
| commit | 59c34be2526059ebd3e485ee03f2f3d3c86c05b0 (patch) | |
| tree | 2730c25b2dd5be5ff3639005d536fb39893a5cd2 | |
| parent | 7f4682b20d3f72f85442d011eac14e0ab0c610a2 (diff) | |
| download | vcpkg-59c34be2526059ebd3e485ee03f2f3d3c86c05b0.tar.gz vcpkg-59c34be2526059ebd3e485ee03f2f3d3c86c05b0.zip | |
Disable Boost auto-link.
Fixes #483. vcpkg always links all installed libraries for the target
triplet; Boost's own auto-link feature is therefore redundant.
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 9e2afdf8a..01d6e9858 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.62-9 +Version: 1.62-10 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 6cc21a091..3fbd06982 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -108,11 +108,10 @@ file( DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp - "\n#define BOOST_ALL_DYN_LINK\n" - ) -endif() +# Disable Boost auto-link. +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp + "\n#define BOOST_ALL_NO_LIB\n" +) file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") |