diff options
| author | Manuel Massing <Manuel Massing m.massing@warped-space.de> | 2017-01-09 11:04:18 +0100 |
|---|---|---|
| committer | Manuel Massing <Manuel Massing m.massing@warped-space.de> | 2017-01-25 10:16:44 +0100 |
| commit | 44590c5c1e934fe260618ee1add2cfc63440202d (patch) | |
| tree | f7caf6693f36ae072ad7bde564a343afb128b07c | |
| parent | a3aeb99092e8dabe1e3bed020be23d60df1787cf (diff) | |
| download | vcpkg-44590c5c1e934fe260618ee1add2cfc63440202d.tar.gz vcpkg-44590c5c1e934fe260618ee1add2cfc63440202d.zip | |
[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 0abbac659..f5676974a 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost Version: 1.62-11 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) |