From 8e911397c5a7e9796714431e9f87787dfd234fcc Mon Sep 17 00:00:00 2001
From: Manuel Massing <Manuel Massing m.massing@warped-space.de>
Date: Mon, 21 Nov 2016 11:43:23 +0100
Subject: [boost] Build boost with zlib support

---
 ports/boost/CONTROL        | 1 +
 ports/boost/portfile.cmake | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 57dfe58e3..8f5fcbb39 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,4 @@
 Source: boost
 Version: 1.62-6
 Description: Peer-reviewed portable C++ source libraries
+Build-Depends: zlib
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 7cc0d60b0..5b488c697 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -31,6 +31,10 @@ endif()
 message(STATUS "Bootstrapping done")
 
 set(B2_OPTIONS
+    -sZLIB_BINARY=zlib
+    -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+    -sNO_BZIP2=1
     -j$ENV{NUMBER_OF_PROCESSORS}
     --debug-configuration
     --hash
-- 
cgit v1.2.3


From 447995519319c80cefd0c612c49aa005ab2586d3 Mon Sep 17 00:00:00 2001
From: Manuel Massing <m.massing@warped-space.de>
Date: Fri, 25 Nov 2016 15:58:57 +0100
Subject: [boost] Link against correct version of zlib when building debug
 variant.

---
 ports/boost/portfile.cmake | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 5b488c697..050418afc 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -65,6 +65,15 @@ if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore")
     set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR})
 endif()
 
+# Add build type specific options
+set(B2_OPTIONS_DBG
+	${B2_OPTIONS}
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
+)
+set(B2_OPTIONS_REL
+	${B2_OPTIONS}
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+)
 
 file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 
@@ -74,7 +83,7 @@ vcpkg_execute_required_process_repeat(
     COMMAND "${SOURCE_PATH}/b2.exe"
         --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
         --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        ${B2_OPTIONS}
+        ${B2_OPTIONS_REL}
         variant=release
         debug-symbols=on
     WORKING_DIRECTORY ${SOURCE_PATH}
@@ -87,7 +96,7 @@ vcpkg_execute_required_process_repeat(
     COMMAND "${SOURCE_PATH}/b2.exe"
         --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
         --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        ${B2_OPTIONS}
+        ${B2_OPTIONS_DBG}
         variant=debug
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME build-${TARGET_TRIPLET}-dbg
-- 
cgit v1.2.3