From 83f3d4336c93db6dbee19faa297af2a317e637f4 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 11 Mar 2024 08:38:17 -0500
Subject: [PATCH 01/15] Make the library modular usable.

---
 build.jam                 | 19 +++++++++++++++++++
 test/config/Jamfile.v2    |  6 +++++-
 test/core/Jamfile.v2      |  9 ++++++++-
 test/core_name/Jamfile.v2 |  5 ++++-
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 build.jam

diff --git a/build.jam b/build.jam
new file mode 100644
index 00000000..f542eac9
--- /dev/null
+++ b/build.jam
@@ -0,0 +1,19 @@
+# Copyright René Ferdinand Rivera Morell 2023
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import project ;
+
+project /boost/pfr
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_pfr ]
+    [ alias all : boost_pfr test ]
+    ;
+
+call-if : boost-library pfr
+    ;
diff --git a/test/config/Jamfile.v2 b/test/config/Jamfile.v2
index 240d0395..250cb3bd 100644
--- a/test/config/Jamfile.v2
+++ b/test/config/Jamfile.v2
@@ -5,13 +5,17 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 #
 
+import-search /boost/config/checks ;
+
 import python ;
 import testing ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 project
     : source-location .
     : requirements
+        <source>/boost/config//boost_config
+        <source>/boost/preprocessor//boost_preprocessor
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
     ;
 
diff --git a/test/core/Jamfile.v2 b/test/core/Jamfile.v2
index 42efedd6..0b2934c1 100644
--- a/test/core/Jamfile.v2
+++ b/test/core/Jamfile.v2
@@ -5,13 +5,20 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 #
 
+import-search /boost/config/checks ;
+
 import python ;
 import testing ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 project
     : source-location .
     : requirements
+        <source>/boost/config//boost_config
+        <source>/boost/core//boost_core
+        <source>/boost/functional//boost_functional
+        <source>/boost/type_index//boost_type_index
+
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
         [ requires cxx14_constexpr ]
     ;
diff --git a/test/core_name/Jamfile.v2 b/test/core_name/Jamfile.v2
index 13b1e4cc..37801548 100644
--- a/test/core_name/Jamfile.v2
+++ b/test/core_name/Jamfile.v2
@@ -8,8 +8,10 @@
 # The way to make it union and UB free by X-Ryl669, https://github.com/X-Ryl669
 #
 
+import-search /boost/config/checks ;
+
 import testing ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 ########## BEGIN of helpers to detect C++20 features support
 
@@ -38,6 +40,7 @@ explicit compiler_supports_cxx20_nontype_tplarg ;
 project
     : source-location .
     : requirements
+        <source>/boost/core//boost_core
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
         [ check-target-builds ../core_name//compiler_supports_cxx20_address_of_non_static_member_tplarg : : [ check-target-builds ../core_name//compiler_supports_cxx20_nontype_tplarg : : <build>no ] ]
     ;

From 44f952a0580eca98c588a91d6ba96d5afac34662 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sun, 5 May 2024 09:00:01 -0500
Subject: [PATCH 02/15] Add requires-b2 check to top-level build file.

---
 build.jam | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.jam b/build.jam
index f542eac9..9e4e9d30 100644
--- a/build.jam
+++ b/build.jam
@@ -3,6 +3,8 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+require-b2 5.1 ;
+
 import project ;
 
 project /boost/pfr

From bf2f996e0bd0fe68e13fde6eb46041510a563368 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 14 Jun 2024 11:33:56 -0500
Subject: [PATCH 03/15] Bump B2 require to 5.2

---
 build.jam | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.jam b/build.jam
index 9e4e9d30..1225c936 100644
--- a/build.jam
+++ b/build.jam
@@ -3,9 +3,7 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-require-b2 5.1 ;
-
-import project ;
+require-b2 5.2 ;
 
 project /boost/pfr
     : common-requirements

From 8e0f664c2336c7254862f91566182d9ca1aa799a Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 20 Jul 2024 19:41:47 -0500
Subject: [PATCH 04/15] Change all <source> references to <library>.

---
 test/config/Jamfile.v2    |  4 ++--
 test/core/Jamfile.v2      | 12 ++++++------
 test/core_name/Jamfile.v2 |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/config/Jamfile.v2 b/test/config/Jamfile.v2
index 250cb3bd..b84d571f 100644
--- a/test/config/Jamfile.v2
+++ b/test/config/Jamfile.v2
@@ -14,8 +14,8 @@ import config : requires ;
 project
     : source-location .
     : requirements
-        <source>/boost/config//boost_config
-        <source>/boost/preprocessor//boost_preprocessor
+        <library>/boost/config//boost_config
+        <library>/boost/preprocessor//boost_preprocessor
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
     ;
 
diff --git a/test/core/Jamfile.v2 b/test/core/Jamfile.v2
index 0b2934c1..1f9df98b 100644
--- a/test/core/Jamfile.v2
+++ b/test/core/Jamfile.v2
@@ -14,10 +14,10 @@ import config : requires ;
 project
     : source-location .
     : requirements
-        <source>/boost/config//boost_config
-        <source>/boost/core//boost_core
-        <source>/boost/functional//boost_functional
-        <source>/boost/type_index//boost_type_index
+        <library>/boost/config//boost_config
+        <library>/boost/core//boost_core
+        <library>/boost/functional//boost_functional
+        <library>/boost/type_index//boost_type_index
 
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
         [ requires cxx14_constexpr ]
@@ -80,7 +80,7 @@ local BLACKLIST_TESTS_FOR_LOOPHOLE =
     tie_anonymous_const_field           # boost::pfr::structure_tie gives compile time error on const fields
   ;
 
-# Those tests are either 
+# Those tests are either
 # * reflecting a non literal type
 # * or calling boost::pfr::get and the result is a user defined structure
 local BLACKLIST_TESTS_FOR_CLASSIC =
@@ -106,7 +106,7 @@ for local source_file in [ glob ./run/*.cpp ] [ glob ../../example/*.cpp ]
 {
     local target_name = $(source_file[1]:B) ;
     pfr_tests += [ run $(source_file) : : : $(STRUCTURED_BINDING_ENGINE) : $(target_name)_sb ] ;
-    
+
     if ! $(target_name) in $(BLACKLIST_TESTS_FOR_LOOPHOLE)
     {
         pfr_tests += [ run $(source_file) : : : $(LOOPHOLE_ENGINE) : $(target_name)_lh ] ;
diff --git a/test/core_name/Jamfile.v2 b/test/core_name/Jamfile.v2
index 37801548..531e3cfa 100644
--- a/test/core_name/Jamfile.v2
+++ b/test/core_name/Jamfile.v2
@@ -40,7 +40,7 @@ explicit compiler_supports_cxx20_nontype_tplarg ;
 project
     : source-location .
     : requirements
-        <source>/boost/core//boost_core
+        <library>/boost/core//boost_core
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1
         [ check-target-builds ../core_name//compiler_supports_cxx20_address_of_non_static_member_tplarg : : [ check-target-builds ../core_name//compiler_supports_cxx20_nontype_tplarg : : <build>no ] ]
     ;

From ca73c528903bfdbeca61d0e35232ac815f279db5 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 20 Jul 2024 22:52:05 -0500
Subject: [PATCH 05/15] Update copyright dates.

---
 build.jam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.jam b/build.jam
index 1225c936..f41e3023 100644
--- a/build.jam
+++ b/build.jam
@@ -1,4 +1,4 @@
-# Copyright René Ferdinand Rivera Morell 2023
+# Copyright René Ferdinand Rivera Morell 2023-2024
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

From 328509ca81a04a58b02bfaa928b8f20e40c1ff66 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Tue, 23 Jul 2024 22:34:24 -0500
Subject: [PATCH 06/15] Move inter-lib dependencies to a project variable and
 into the build targets.

---
 build.jam | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.jam b/build.jam
index f41e3023..90ef8113 100644
--- a/build.jam
+++ b/build.jam
@@ -11,9 +11,10 @@ project /boost/pfr
     ;
 
 explicit
-    [ alias boost_pfr ]
+    [ alias boost_pfr : : : : <library>$(boost_dependencies) ]
     [ alias all : boost_pfr test ]
     ;
 
 call-if : boost-library pfr
     ;
+

From 94c19617403ad9d8bd8b33267f4845bc6153f02b Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sun, 28 Jul 2024 11:07:55 -0500
Subject: [PATCH 07/15] Adjust doc build to avoid boost-root references.

---
 doc/Jamfile.v2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 078881e7..3a0b2437 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -18,7 +18,7 @@ project pfr/doc ;
 
 #
 # Common params for doxygen
-# 
+#
 
 local doxygen_params =
         <doxygen:param>EXTRACT_ALL=NO
@@ -43,8 +43,8 @@ local doxygen_params =
 
 doxygen autodoc_pfr
     :
-        [ glob ../../../boost/pfr.hpp ]
-        [ glob ../../../boost/pfr/*.hpp ]
+        [ glob ../include/boost/pfr.hpp ]
+        [ glob ../include/boost/pfr/*.hpp ]
     :
         $(doxygen_params)
         <xsl:param>"boost.doxygen.reftitle=Reference Section of PFR"

From 8f9ce979a905f8684e88e6f02cf3d0e05b3fe02d Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 16:04:18 -0500
Subject: [PATCH 08/15] Use same depinst setup for posix and windows CI.

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5df5ae23..45044e6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,10 +79,10 @@ jobs:
           git clone -b $BOOST_BRANCH --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           git submodule update --init --depth 10 --jobs 2 tools/boostdep tools/inspect libs/filesystem
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--depth 10 --jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           ./bootstrap.sh
           ./b2 -d0 headers
           ./b2 -j4 variant=debug tools/inspect/build
@@ -174,6 +174,7 @@ jobs:
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
           git submodule update --init tools/boostdep
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           cmd /c bootstrap
           b2 -d0 headers
 

From c919b895922e04abbcbb07435a962d1ff3f6722d Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 16:32:32 -0500
Subject: [PATCH 09/15] Add functional as dependency to install for testing as
 boostdep misses it.

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45044e6d..c527b73d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--depth 10 --jobs 3" $LIBRARY
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem functional
           ./bootstrap.sh
           ./b2 -d0 headers
           ./b2 -j4 variant=debug tools/inspect/build
@@ -174,7 +174,7 @@ jobs:
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
           git submodule update --init tools/boostdep
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem functional
           cmd /c bootstrap
           b2 -d0 headers
 

From 1bc1a1ca66130f19b31d1ae3f6882e8760daab35 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 16:44:02 -0500
Subject: [PATCH 10/15] Add functional as dependency to install for testing as
 boostdep misses it.

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c527b73d..b9a89905 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,8 @@ jobs:
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--depth 10 --jobs 3" $LIBRARY
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem functional
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           ./bootstrap.sh
           ./b2 -d0 headers
           ./b2 -j4 variant=debug tools/inspect/build
@@ -174,7 +175,8 @@ jobs:
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
           git submodule update --init tools/boostdep
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem functional
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           cmd /c bootstrap
           b2 -d0 headers
 

From b76ee1dfa9341f247b2c9f328bd6318d83ddec93 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 16:49:23 -0500
Subject: [PATCH 11/15] Explicitly add test dir to depinst.

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9a89905..80ebc6c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,9 +81,8 @@ jobs:
           git submodule update --init --depth 10 --jobs 2 tools/boostdep tools/inspect libs/filesystem
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--depth 10 --jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--depth 10 --jobs 3" $LIBRARY
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           ./bootstrap.sh
           ./b2 -d0 headers
           ./b2 -j4 variant=debug tools/inspect/build
@@ -174,9 +173,8 @@ jobs:
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
           git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--jobs 3" %LIBRARY%
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           cmd /c bootstrap
           b2 -d0 headers
 

From dae1d1376ccf2ffd16ae7e68c417ad73a35208e5 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 20:50:11 -0500
Subject: [PATCH 12/15] Fetch the same git submods for posix and windows CI
 jobs.

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80ebc6c6..a1482b4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,19 +78,19 @@ jobs:
           cd ..
           git clone -b $BOOST_BRANCH --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
-          git submodule update --init --depth 10 --jobs 2 tools/boostdep tools/inspect libs/filesystem
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/filesystem tools/inspect
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--depth 10 --jobs 3" $LIBRARY
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           ./bootstrap.sh
           ./b2 -d0 headers
-          ./b2 -j4 variant=debug tools/inspect/build
+          ./b2 variant=debug tools/inspect/build
 
       - name: Run tests
         run: |
           cd ../boost-root
-          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release "${{matrix.cxxflags}}" "${{matrix.linkflags}}" "${{matrix.launcher}}"
+          ./b2 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release "${{matrix.cxxflags}}" "${{matrix.linkflags}}" "${{matrix.launcher}}"
           dist/bin/inspect libs/$LIBRARY
 
       - name: Test boost namespace stripping
@@ -172,7 +172,7 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/filesystem
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--jobs 3" %LIBRARY%
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           cmd /c bootstrap

From 3c870641778e5a1a9420184e98a1ce18d2e48f2c Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 16 Aug 2024 21:09:03 -0500
Subject: [PATCH 13/15] Back to fetching functional as a dependency as depinst
 misses it.

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1482b4b..a0a6fdee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,10 +78,11 @@ jobs:
           cd ..
           git clone -b $BOOST_BRANCH --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
-          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/filesystem tools/inspect
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/functional libs/filesystem tools/inspect
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--depth 10 --jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           ./bootstrap.sh
           ./b2 -d0 headers
@@ -172,9 +173,9 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/filesystem
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/functional
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--jobs 3" %LIBRARY%
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           cmd /c bootstrap
           b2 -d0 headers
 

From 176332f3f1340a4b1c94943c61ed00ed4fdd5f3f Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 17 Aug 2024 12:04:31 -0500
Subject: [PATCH 14/15] Replace functional deps with correct container_hash
 deps.

---
 .github/workflows/ci.yml | 2 --
 test/core/Jamfile.v2     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff4f8c8e..e2108347 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,6 @@ jobs:
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--depth 10 --jobs 3" $LIBRARY
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           ./bootstrap.sh
           ./b2 -d0 headers
@@ -175,7 +174,6 @@ jobs:
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
           git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/functional
           python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--jobs 3" %LIBRARY%
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" functional
           cmd /c bootstrap
           b2 -d0 headers
 
diff --git a/test/core/Jamfile.v2 b/test/core/Jamfile.v2
index 1f9df98b..a4a04ee5 100644
--- a/test/core/Jamfile.v2
+++ b/test/core/Jamfile.v2
@@ -16,7 +16,7 @@ project
     : requirements
         <library>/boost/config//boost_config
         <library>/boost/core//boost_core
-        <library>/boost/functional//boost_functional
+        <library>/boost/container_hash//boost_container_hash
         <library>/boost/type_index//boost_type_index
 
         <define>BOOST_PFR_DETAIL_STRICT_RVALUE_TESTING=1

From 43f6fc5328fe04a5237628c3496f464c84dc1634 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 17 Aug 2024 13:29:19 -0500
Subject: [PATCH 15/15] Undo adding function dep fetch.

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2108347..e1c04728 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,11 +78,11 @@ jobs:
           cd ..
           git clone -b $BOOST_BRANCH --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
-          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/functional libs/filesystem tools/inspect
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/filesystem tools/inspect
+          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
           rm -rf libs/$LIBRARY/*
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--depth 10 --jobs 3" $LIBRARY
-          python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 3" filesystem
+          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--depth 10 --jobs 3" $LIBRARY
           ./bootstrap.sh
           ./b2 -d0 headers
           ./b2 variant=debug tools/inspect/build
@@ -172,8 +172,8 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 10 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init --depth 10 --jobs 2 tools/boostdep libs/functional
-          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --include test --git_args "--jobs 3" %LIBRARY%
+          git submodule update --init --depth 10 --jobs 2 tools/boostdep
+          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools --git_args "--jobs 3" %LIBRARY%
           cmd /c bootstrap
           b2 -d0 headers