Skip to content

Commit

Permalink
Fix Boost dynamic build.
Browse files Browse the repository at this point in the history
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 5a3881a.
  • Loading branch information
chrullrich committed Jan 17, 2017
1 parent 60b0eb3 commit bc874e3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ports/boost/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: boost
Version: 1.62-10
Version: 1.62-11
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib
6 changes: 6 additions & 0 deletions ports/boost/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit bc874e3

Please sign in to comment.