Merge pull request #590 from mmassing/boost_with_bzip2

[boost] Add bzip2 support
This commit is contained in:
Robert Schumacher 2017-01-25 17:28:50 -08:00
commit 8ff736c6a4
2 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,4 @@
Source: boost Source: boost
Version: 1.62-12 Version: 1.62-12
Description: Peer-reviewed portable C++ source libraries Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib Build-Depends: zlib, bzip2

View File

@ -32,7 +32,7 @@ message(STATUS "Bootstrapping done")
set(B2_OPTIONS set(B2_OPTIONS
-sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-sNO_BZIP2=1 -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-j$ENV{NUMBER_OF_PROCESSORS} -j$ENV{NUMBER_OF_PROCESSORS}
--debug-configuration --debug-configuration
--hash --hash
@ -67,12 +67,16 @@ set(B2_OPTIONS_DBG
${B2_OPTIONS} ${B2_OPTIONS}
-sZLIB_BINARY=zlibd -sZLIB_BINARY=zlibd
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
) )
set(B2_OPTIONS_REL set(B2_OPTIONS_REL
${B2_OPTIONS} ${B2_OPTIONS}
-sZLIB_BINARY=zlib -sZLIB_BINARY=zlib
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" -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) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)