diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 17:28:50 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 17:28:50 -0800 |
| commit | 8ff736c6a47060fa853047da88b5cecbbebadd4e (patch) | |
| tree | cc48d1fa9637d6c63e78f6d65540555d266719c6 | |
| parent | fe96dcab61c3acdabf446463bf1f538d3148863a (diff) | |
| parent | 7bd267bc13906bdb7f89cee4e71a53822c473fef (diff) | |
| download | vcpkg-8ff736c6a47060fa853047da88b5cecbbebadd4e.tar.gz vcpkg-8ff736c6a47060fa853047da88b5cecbbebadd4e.zip | |
Merge pull request #590 from mmassing/boost_with_bzip2
[boost] Add bzip2 support
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 76d19763c..039cef721 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost Version: 1.62-12 Description: Peer-reviewed portable C++ source libraries -Build-Depends: zlib +Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 5c272e9cc..f9c0a0a34 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -32,7 +32,7 @@ message(STATUS "Bootstrapping done") set(B2_OPTIONS -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" - -sNO_BZIP2=1 + -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" -j$ENV{NUMBER_OF_PROCESSORS} --debug-configuration --hash @@ -67,12 +67,16 @@ set(B2_OPTIONS_DBG ${B2_OPTIONS} -sZLIB_BINARY=zlibd -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" + -sBZIP2_BINARY=bz2 + -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" ) set(B2_OPTIONS_REL ${B2_OPTIONS} -sZLIB_BINARY=zlib -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" + -sBZIP2_BINARY=bz2 + -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" ) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) |