From 44590c5c1e934fe260618ee1add2cfc63440202d Mon Sep 17 00:00:00 2001
From: Manuel Massing <Manuel Massing m.massing@warped-space.de>
Date: Mon, 9 Jan 2017 11:04:18 +0100
Subject: [PATCH 1/2] [boost] Add bzip2 support

---
 ports/boost/CONTROL        | 2 +-
 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)

From 7bd267bc13906bdb7f89cee4e71a53822c473fef Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 25 Jan 2017 17:27:53 -0800
Subject: [PATCH 2/2] [boost] Bump version to correspond with added bzip2
 dependency.

---
 ports/boost/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index f5676974a..039cef721 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,4 +1,4 @@
 Source: boost
-Version: 1.62-11
+Version: 1.62-12
 Description: Peer-reviewed portable C++ source libraries
 Build-Depends: zlib, bzip2