[boost-container] Add boost-static-assert dep

microsoft · May 18, 2024 · 05e9cf0 · 05e9cf0
1 parent 7eb700c
commit 05e9cf0
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/ports/boost-container/emscripten-pthread.diff b/ports/boost-container/emscripten-pthread.diff
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01e97c5..30af76f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,6 +15,13 @@ add_library(boost_container
+   src/synchronized_pool_resource.cpp
+   src/unsynchronized_pool_resource.cpp
+ )
++if(EMSCRIPTEN)
++  # BOOST_HAS_PTHREADS is required to avoid windows declarations in
++  # libs/container/include/boost/container/detail/thread_mutex.hpp
++  # This should come from include/boost/config/detail/posix_features.hpp,
++  # but ... https://github.com/microsoft/vcpkg/issues/38469
++  target_compile_options(boost_container PUBLIC -pthread)
++endif()
+
+ add_library(Boost::container ALIAS boost_container)
+
diff --git a/ports/boost-container/no-static-assert.diff b/ports/boost-container/no-static-assert.diff
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78acbe2..01e97c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,6 @@ target_link_libraries(boost_container
+     Boost::config
+     Boost::intrusive
+     Boost::move
+-    Boost::static_assert
+ )
+
+ target_compile_definitions(boost_container
diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json
@@ -2,8 +2,9 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-container",
   "version": "1.85.0",
+  "port-version": 1,
   "description": "Boost container module",
-  "homepage": "https://github.com/boostorg/container",
+  "homepage": "https://www.boost.org/libs/container",
   "license": "BSL-1.0",
   "dependencies": [
     {

diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
@@ -28,6 +28,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 0
 $portVersions = @{
+    'boost-container' = 1;
 }
 
 function Get-PortVersion {

diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66fab56c944311d758da01419f79c3253e7dfda1",
+      "version": "1.85.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1261ff9673aab60f032284e51aa4400a1fa88a6a",
       "version": "1.85.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -810,7 +810,7 @@
     },
     "boost-container": {
       "baseline": "1.85.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-container-hash": {
       "baseline": "1.85.0",