4 files changed, 36 insertions, 1 deletions
diff --git a/ports/boost-json/b2-options.cmake b/ports/boost-json/b2-options.cmake
new file mode 100644
index 000000000..b05e7494f
--- /dev/null
+++ b/ports/boost-json/b2-options.cmake
@@ -0,0 +1,3 @@
+if(APPLE)
+    list(APPEND B2_OPTIONS cxxstd=11)
+endif()
+\ No newline at end of file
diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake
index 8a91cd6ca..6dbc2ee53 100644
--- a/ports/boost-json/portfile.cmake
+++ b/ports/boost-json/portfile.cmake
@@ -8,5 +8,20 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+# see https://github.com/boostorg/json/issues/556 fore more details
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/config" "import config/checks/config")
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n      <library>/boost//container/<warnings-as-errors>off" "")
+
+vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config")
+
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+boost_modular_build(
+    SOURCE_PATH ${SOURCE_PATH}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json
index c11c93292..0b36bbf83 100644
--- a/ports/boost-json/vcpkg.json
+++ b/ports/boost-json/vcpkg.json
@@ -1,14 +1,23 @@
 {
   "name": "boost-json",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost json module",
   "homepage": "https://github.com/boostorg/json",
   "dependencies": [
     "boost-align",
     "boost-assert",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-container",
     "boost-exception",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-system",
     "boost-throw-exception",
     "boost-utility",
diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json
index ae32d8dd6..8751ddd8e 100644
--- a/ports/boost-python/vcpkg.json
+++ b/ports/boost-python/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-python",
   "version-string": "1.75.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Boost python module",
   "homepage": "https://github.com/boostorg/python",
   "supports": "!uwp & !(arm & windows) & !emscripten",
   "dependencies": [
     "boost-bind",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-conversion",
@@ -19,6 +23,10 @@
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-numeric-conversion",
     "boost-preprocessor",