From 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Fri, 28 May 2021 20:20:52 +0200
Subject: [Boost] fix not header only libs (#17372)

* [boost] don't handle compiled libs as header only ones (json/python)

* add version files

* [boost script] wait for lock to not get failure messages

* [boost-json] fix build

* add version files

* remove unnecessary changes

* Trigger Build because of #17612

* update boost asio and concept-check as requested by ci

* add version files

* Trigger Build because of #17612

* apply code review

* add version files

* fix version stuff

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* fixes

* add version file

* fix wrong suggestion

* add version files

* Update versions/b-/boost.json

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Address the review suggestion

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
---
 scripts/boost/generate-ports.ps1           | 16 ++++++++++++----
 scripts/boost/post-source-stubs/json.cmake |  7 +++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 scripts/boost/post-source-stubs/json.cmake

(limited to 'scripts')

diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 499a09dee..f863d8811 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -28,9 +28,11 @@ else
 $port_versions = @{
     #e.g.  "asio" = 1;
     "asio" = 1;
-    "python" = 2;
-    "context" = 2;
+    "python" = 3;
+    "context" = 3;
     "concept-check" = 2;
+    "regex" = 2;
+    "json" = 1;
 }
 
 $per_port_data = @{
@@ -291,7 +293,13 @@ foreach ($library in $libraries)
         "Downloading boost/$library..."
         & $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz"
     }
-    $hash = & $vcpkg hash $archive
+    $hash = & $vcpkg --x-wait-for-lock hash $archive
+    # remove prefix "Waiting to take filesystem lock on <path>/.vcpkg-root... "
+    if($hash -is [Object[]])
+    {
+        $hash = $hash[1]
+    }
+     
     $unpacked = "$scriptsDir/libs/$library-boost-$version"
     if (!(Test-Path $unpacked))
     {
@@ -405,7 +413,7 @@ foreach ($library in $libraries)
         $deps += @("boost-vcpkg-helpers")
 
         $needsBuild = $false
-        if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse" -and $library -ne "graph_parallel")
+        if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "(metaparse|graph_parallel|function_types)")
         {
             $deps += @(
                 @{ name="boost-build"; host=$True },
diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake
new file mode 100644
index 000000000..698c7060a
--- /dev/null
+++ b/scripts/boost/post-source-stubs/json.cmake
@@ -0,0 +1,7 @@
+# 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")
-- 
cgit v1.2.3