[boost] Improve non-windows support

47 files changed, 94 insertions, 48 deletions

diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index 8335a6dd8..169640a9b 100644
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-asio

 Version: 1.66.0-1

-Build-Depends: boost-coroutine (windows), boost-date-time, boost-regex, boost-system, boost-vcpkg-helpers, openssl

+Build-Depends: boost-coroutine (!uwp), boost-date-time, boost-regex, boost-system, boost-vcpkg-helpers, openssl

 Description: Boost asio module

diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL
index 4a625b6df..6289fb560 100644
--- a/ports/boost-atomic/CONTROL
+++ b/ports/boost-atomic/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-atomic

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers

 Description: Boost atomic module

diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL
index b5fb892cd..563547137 100644
--- a/ports/boost-chrono/CONTROL
+++ b/ports/boost-chrono/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-chrono

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-detail, boost-integer, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

 Description: Boost chrono module

diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL
index 3c7b1c17e..9c90be96e 100644
--- a/ports/boost-compute/CONTROL
+++ b/ports/boost-compute/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-compute

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (windows), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers

+Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers

 Description: Boost compute module

diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL
index 69e641d36..2fbed7951 100644
--- a/ports/boost-container/CONTROL
+++ b/ports/boost-container/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-container

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers

 Description: Boost container module

diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index 22295dddc..bd72d021c 100644
--- a/ports/boost-context/CONTROL
+++ b/ports/boost-context/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-context

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-detail, boost-integer, boost-pool, boost-predef, boost-smart-ptr, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-vcpkg-helpers

 Description: Boost context module

diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index 77683890a..998958b5f 100644
--- a/ports/boost-coroutine/CONTROL
+++ b/ports/boost-coroutine/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-coroutine

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-context (windows), boost-detail, boost-exception, boost-integer, boost-move, boost-range, boost-system, boost-thread (windows), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-range, boost-system, boost-thread (!uwp), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost coroutine module

diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL
index fd52e362a..bd1156825 100644
--- a/ports/boost-coroutine2/CONTROL
+++ b/ports/boost-coroutine2/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-coroutine2

 Version: 1.66.0

-Build-Depends: boost-assert, boost-config, boost-context (windows), boost-detail, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-config, boost-context (!uwp), boost-detail, boost-vcpkg-helpers

 Description: Boost coroutine2 module

diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL
index 8e8738e8d..6814dc0e1 100644
--- a/ports/boost-date-time/CONTROL
+++ b/ports/boost-date-time/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-date-time

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-mpl, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

 Description: Boost date_time module

diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL
index 96c9f59dc..cfb7e5e6e 100644
--- a/ports/boost-dll/CONTROL
+++ b/ports/boost-dll/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-dll

 Version: 1.66.0

-Build-Depends: boost-config, boost-core, boost-filesystem (windows), boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

 Description: Boost dll module

diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL
index 476c53cf4..2f807d992 100644
--- a/ports/boost-exception/CONTROL
+++ b/ports/boost-exception/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-exception

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost exception module

diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index b02c94a3b..a3b230904 100644
--- a/ports/boost-fiber/CONTROL
+++ b/ports/boost-fiber/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-fiber

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-context (windows), boost-core, boost-detail, boost-filesystem (windows), boost-format, boost-intrusive, boost-predef, boost-smart-ptr, boost-vcpkg-helpers

+Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers

 Description: Boost fiber module

diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index 4717d608b..d50e6a177 100644
--- a/ports/boost-filesystem/CONTROL
+++ b/ports/boost-filesystem/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-filesystem

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost filesystem module

diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index 3f1e8e1ed..13f28ffd5 100644
--- a/ports/boost-graph-parallel/CONTROL
+++ b/ports/boost-graph-parallel/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-graph-parallel

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-detail, boost-dynamic-bitset, boost-function, boost-functional, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-dynamic-bitset, boost-function, boost-functional, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers

 Description: Boost graph_parallel module

diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index 8d2fdb2eb..32e083f05 100644
--- a/ports/boost-graph-parallel/portfile.cmake
+++ b/ports/boost-graph-parallel/portfile.cmake
@@ -10,7 +10,5 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

-boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL
index 12d74bc1e..a7dd22633 100644
--- a/ports/boost-graph/CONTROL
+++ b/ports/boost-graph/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-graph

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-modular-build-helper, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (windows), boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive

+Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive

 Description: Boost graph module

diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL
index 644558413..cfd096adc 100644
--- a/ports/boost-interval/CONTROL
+++ b/ports/boost-interval/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-interval

 Version: 1.66.0

-Build-Depends: boost-compatibility, boost-config, boost-logic (windows), boost-vcpkg-helpers

+Build-Depends: boost-compatibility, boost-config, boost-logic (!uwp), boost-vcpkg-helpers

 Description: Boost interval module

diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index d48fdfd24..d0d82f8b6 100644
--- a/ports/boost-iostreams/CONTROL
+++ b/ports/boost-iostreams/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-iostreams

 Version: 1.66.0

-Build-Depends: boost-assert, boost-bind, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib

+Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib

 Description: Boost iostreams module

diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index 0a37505b1..5ed156bdd 100644
--- a/ports/boost-locale/CONTROL
+++ b/ports/boost-locale/CONTROL
@@ -1,7 +1,7 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-locale

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-function, boost-integer, boost-iterator, boost-smart-ptr, boost-static-assert, boost-thread (windows), boost-type-traits, boost-unordered, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread (!uwp), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)

 Description: Boost locale module

 

 Feature: icu

diff --git a/ports/boost-locale/cmake-fragment.cmake b/ports/boost-locale/cmake-fragment.cmake
new file mode 100644
index 000000000..11d3ed70e
--- /dev/null
+++ b/ports/boost-locale/cmake-fragment.cmake
@@ -0,0 +1,10 @@
+find_library(LIBICONV_LIBRARY iconv)

+get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY)

+

+list(APPEND B2_OPTIONS

+    boost.locale.iconv=on

+    boost.locale.posix=on

+    /boost/locale//boost_locale

+    boost.locale.icu=off

+    -sICONV_PATH=${LIBICONV_LIBRARY}

+)

diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index 9c1aa2ff4..e6d82a1a6 100644
--- a/ports/boost-locale/portfile.cmake
+++ b/ports/boost-locale/portfile.cmake
@@ -19,6 +19,7 @@ endif()
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(

     SOURCE_PATH ${SOURCE_PATH}

+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake"

     OPTIONS

         boost.locale.iconv=off

         boost.locale.posix=off

diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index e8ac68f44..f8398c7ca 100644
--- a/ports/boost-log/CONTROL
+++ b/ports/boost-log/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-log

 Version: 1.66.0

-Build-Depends: boost-align, boost-array, boost-asio, boost-assert, boost-atomic, boost-bind, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (windows), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (windows), boost-math, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread (windows), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive

+Build-Depends: boost-align, boost-array, boost-asio, boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread (!uwp), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive

 Description: Boost log module

diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL
index 33b230a22..2617f4412 100644
--- a/ports/boost-math/CONTROL
+++ b/ports/boost-math/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-math

 Version: 1.66.0

-Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-modular-build-helper, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost math module

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 20306e7ed..4153f0132 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -9,6 +9,10 @@ set(VCPKG_PLATFORM_TOOLSET external)
 

 set(B2_OPTIONS)

 

+if(DEFINED BOOST_CMAKE_FRAGMENT)

+    include(${BOOST_CMAKE_FRAGMENT})

+endif()

+

 # Add build type specific options

 if(BUILD_SHARED_LIBS)

     list(APPEND B2_OPTIONS runtime-link=shared)

@@ -28,7 +32,11 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
     list(APPEND B2_OPTIONS address-model=64)

 endif()

 

-list(APPEND B2_OPTIONS target-os=linux toolset=gcc)

+if(APPLE)

+    list(APPEND B2_OPTIONS target-os=darwin toolset=clang)

+else()

+    list(APPEND B2_OPTIONS target-os=linux toolset=gcc)

+endif()

 

 string(REPLACE " " " <compileflags>" CXXFLAGS "${CMAKE_CXX_FLAGS}")

 #set(CXXFLAGS "${CXXFLAGS} <compileflags>-Wno-error=unused-command-line-argument")

@@ -45,6 +53,10 @@ foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES})
     set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}")

 endforeach()

 

+if(APPLE)

+  set(CXXFLAGS "${CXXFLAGS} <compileflags>-D_DARWIN_C_SOURCE")

+endif()

+

 find_library(ZLIB_LIBPATH z)

 list(APPEND B2_OPTIONS

     -sZLIB_BINARY=z

diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index d57815738..a7f1ecf61 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
 Source: boost-modular-build-helper

-Version: 2

+Version: 2018-04-15

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 222fc7fe9..2833c51a6 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -1,5 +1,5 @@
 function(boost_modular_build)

-    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS" "OPTIONS" ${ARGN})

+    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS;BOOST_CMAKE_FRAGMENT" "OPTIONS" ${ARGN})

 

     if(NOT DEFINED _bm_SOURCE_PATH)

         message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.")

@@ -80,6 +80,9 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)

 

     if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+        if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)

+            set(fragment_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")

+        endif()

         vcpkg_configure_cmake(

             SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build

             PREFER_NINJA

@@ -87,8 +90,13 @@ function(boost_modular_build)
                 "-DB2_EXE=${B2_EXE}"

                 "-DSOURCE_PATH=${_bm_SOURCE_PATH}"

                 "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}"

+                ${fragment_option}

         )

         vcpkg_install_cmake()

+

+        if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib)

+            message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")

+        endif()

         return()

     endif()

 

diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam
index bd3797283..abefc7fae 100644
--- a/ports/boost-modular-build-helper/user-config.jam
+++ b/ports/boost-modular-build-helper/user-config.jam
@@ -45,3 +45,6 @@ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" <variant>debu
 

 lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/lib/icudt.lib" <variant>release : : ;

 lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" <variant>debug : : ;

+

+lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>release : : ;

+lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>debug : : ;

diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index 30ce81a1d..b5cfcd106 100644
--- a/ports/boost-mpi/CONTROL
+++ b/ports/boost-mpi/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-mpi

 Version: 1.66.0-1

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi

+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi

 Description: Boost mpi module

diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index 66679c5c9..d8b2b34ec 100644
--- a/ports/boost-poly-collection/CONTROL
+++ b/ports/boost-poly-collection/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-poly-collection

 Version: 1.66.0

-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-type-erasure (windows), boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-type-erasure (!uwp), boost-type-traits, boost-vcpkg-helpers

 Description: Boost poly_collection module

diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL
index 141cc45c3..8c054f8a9 100644
--- a/ports/boost-pool/CONTROL
+++ b/ports/boost-pool/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-pool

 Version: 1.66.0

-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread (windows), boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread (!uwp), boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

 Description: Boost pool module

diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
index 28d9c027d..25ddd60ef 100644
--- a/ports/boost-process/CONTROL
+++ b/ports/boost-process/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-process

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-asio, boost-config, boost-core, boost-filesystem (windows), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-algorithm, boost-asio, boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi

 Description: Boost process module

diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL
index b43937e55..931843a34 100644
--- a/ports/boost-program-options/CONTROL
+++ b/ports/boost-program-options/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-program-options

 Version: 1.66.0

-Build-Depends: boost-any, boost-bind, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers

 Description: Boost program_options module

diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL
index 1efeeaafa..2fa6b682c 100644
--- a/ports/boost-random/CONTROL
+++ b/ports/boost-random/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-random

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-math, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost random module

diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index efd3e7f7e..1ff1473ac 100644
--- a/ports/boost-regex/CONTROL
+++ b/ports/boost-regex/CONTROL
@@ -1,7 +1,7 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-regex

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

 Description: Boost regex module

 

 Feature: icu

diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL
index ae97a8c30..1cfc392e9 100644
--- a/ports/boost-serialization/CONTROL
+++ b/ports/boost-serialization/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-serialization

 Version: 1.66.0

-Build-Depends: boost-array, boost-assert, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers

+Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers

 Description: Boost serialization module

diff --git a/ports/boost-signals/CONTROL b/ports/boost-signals/CONTROL
index 160f73c51..1b3743e2f 100644
--- a/ports/boost-signals/CONTROL
+++ b/ports/boost-signals/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-signals

 Version: 1.66.0

-Build-Depends: boost-any, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-function, boost-iterator, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost signals module

diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL
index ed71760c0..f79535e4c 100644
--- a/ports/boost-spirit/CONTROL
+++ b/ports/boost-spirit/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-spirit

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (windows), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (windows), boost-iterator, boost-lexical-cast, boost-locale (windows), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (windows), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers

+Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (!uwp), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers

 Description: Boost spirit module

diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index 9979ef4e1..c55b3ea01 100644
--- a/ports/boost-stacktrace/CONTROL
+++ b/ports/boost-stacktrace/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-stacktrace

 Version: 1.66.0

-Build-Depends: boost-array, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-lexical-cast, boost-math, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-array, boost-build, boost-config, boost-core, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi

 Description: Boost stacktrace module

diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL
index 953782bfb..95f01a09c 100644
--- a/ports/boost-system/CONTROL
+++ b/ports/boost-system/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-system

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-core, boost-integer, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi

 Description: Boost system module

diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index 95b0d8fe9..f77ae6c94 100644
--- a/ports/boost-test/CONTROL
+++ b/ports/boost-test/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-test

 Version: 1.66.0-2

-Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-range, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-range, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost test module

diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake
index acb28c7d4..329256a83 100644
--- a/ports/boost-test/portfile.cmake
+++ b/ports/boost-test/portfile.cmake
@@ -14,7 +14,6 @@ include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

-

 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

     file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)

     file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)

@@ -28,3 +27,4 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)

     file(REMOVE ${DEBUG_MONITOR_LIBS})

 endif()

+

diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 33bc787a1..963eaa5bc 100644
--- a/ports/boost-thread/CONTROL
+++ b/ports/boost-thread/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-thread

 Version: 1.66.0

-Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-modular-build-helper, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

+Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

 Description: Boost thread module

diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL
index b24137fbb..328b78579 100644
--- a/ports/boost-timer/CONTROL
+++ b/ports/boost-timer/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-timer

 Version: 1.66.0

-Build-Depends: boost-build, boost-modular-build-helper, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-system, boost-throw-exception, boost-vcpkg-helpers

+Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers

 Description: Boost timer module

diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL
index 786acf596..b8e6bc4dd 100644
--- a/ports/boost-type-erasure/CONTROL
+++ b/ports/boost-type-erasure/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-type-erasure

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-detail, boost-fusion, boost-iterator, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread (windows), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread (!uwp), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Description: Boost type_erasure module

diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index 55fa476f4..7f5ecc9fb 100644
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@@ -6,7 +6,8 @@ param (
 

 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition

 

-$libsDisabledInUWP = "iostreams|filesystem|thread|context|python|stacktrace|program-options|program_options|coroutine`$|fiber|locale|test|type-erasure|type_erasure|wave|log"

+$libsDisabledInLinux = "python|fiber"

+$libsDisabledInUWP = "iostreams|filesystem|thread|context|python|stacktrace|program[_-]options|coroutine`$|fiber|locale|test|type[_-]erasure|wave|log"

 

 function Generate()

 {

@@ -100,6 +101,7 @@ function Generate()
                 "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"

                 "boost_modular_build("

                 "    SOURCE_PATH `${SOURCE_PATH}"

+                "    BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake`""

                 "    OPTIONS"

                 "        boost.locale.iconv=off"

                 "        boost.locale.posix=off"

@@ -307,10 +309,14 @@ foreach ($library in $libraries)
             -and `

             (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator"))

         } | % { "boost-$_" -replace "_","-" } | % {

-            if ($_ -match $libsDisabledInUWP)

+            if ($_ -match $libsDisabledInLinux -and $_ -match $libsDisabledInUWP)

             {

                 "$_ (windows)"

             }

+            elseif ($_ -match $libsDisabledInUWP)

+            {

+                "$_ (!uwp)"

+            }

             else

             {

                 $_

@@ -320,7 +326,7 @@ foreach ($library in $libraries)
         $deps += @("boost-vcpkg-helpers")

 

         $needsBuild = $false

-        if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse")

+        if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse" -and $library -ne "graph_parallel")

         {

             $deps += @("boost-build", "boost-modular-build-helper")

             $needsBuild = $true

@@ -335,6 +341,10 @@ foreach ($library in $libraries)
         {

             $deps += @("zlib", "bzip2")

         }

+        elseif ($library -eq "locale")

+        {

+            $deps += @("libiconv (!uwp&!windows)")

+        }

         elseif ($library -eq "asio")

         {

             $deps += @("openssl")

@@ -350,10 +360,14 @@ foreach ($library in $libraries)
             -Depends $deps `

             -NeedsBuild $needsBuild

 

-        if ($library -match $libsDisabledInUWP)

+        if ($library -match $libsDisabledInLinux -and $library -match $libsDisabledInUWP)

         {

             $libraries_in_boost_port += @("$library (windows)")

         }

+        elseif ($library -match $libsDisabledInUWP)

+        {

+            $libraries_in_boost_port += @("$library (!uwp)")

+        }

         else

         {

             $libraries_in_boost_port += @($library)

diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index 4fffc2e71..251703103 100644
--- a/ports/boost-wave/CONTROL
+++ b/ports/boost-wave/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-wave

 Version: 1.66.0

-Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (windows), boost-integer, boost-iterator, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

+Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers

 Description: Boost wave module

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 0153a151a..72993bba6 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -2,7 +2,7 @@
 Source: boost

 Version: 1.66.0

 Description: Peer-reviewed portable C++ source libraries

-Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-context (windows), boost-conversion, boost-convert, boost-core, boost-coroutine (windows), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (windows), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (windows), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (windows), boost-local-function, boost-lockfree, boost-log (windows), boost-logic (windows), boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-optional, boost-parameter, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options (windows), boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (windows), boost-statechart, boost-static-assert, boost-system, boost-test (windows), boost-thread (windows), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (windows), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (windows), boost-winapi, boost-xpressive

+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-context (!uwp), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic (!uwp), boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-optional, boost-parameter, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options (!uwp), boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!uwp), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!uwp), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive

 

 Feature: mpi

 Description: Build with MPI support