From 3fe7f2519cdc8f861c71c5ad9ecadcf4fa3e2088 Mon Sep 17 00:00:00 2001
From: garroyo <garroyo@ifimar-conicet.gob.ar>
Date: Fri, 28 Aug 2026 17:57:07 -0300
Subject: [PATCH] boost: fix bjam bootstrap under GCC 14 for @1.56.0

---
 .../builtin/packages/boost/package.py         | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/repos/spack_repo/builtin/packages/boost/package.py b/repos/spack_repo/builtin/packages/boost/package.py
index a486f8781bd..a00c326f3d6 100644
--- a/repos/spack_repo/builtin/packages/boost/package.py
+++ b/repos/spack_repo/builtin/packages/boost/package.py
@@ -296,10 +296,12 @@ def libs(self):
     conflicts("context-impl=ucontext", when="@:1.65.0")
     conflicts("context-impl=winfib", when="@:1.65.0")
 
-    # Coroutine, Context, Fiber, etc., are not straightforward. The version ranges in which
-    # these libraries exist are encoded in the "when" clauses of the variants above.
+    # Coroutine, Context, Fiber, etc., are not straightforward.
+    conflicts("+context", when="@:1.50")  # Context since 1.51.0.
     conflicts("cxxstd=98", when="+context")  # Context requires >=C++11.
+    conflicts("+coroutine", when="@:1.52")  # Context since 1.53.0.
     conflicts("~context", when="+coroutine")  # Coroutine requires Context.
+    conflicts("+fiber", when="@:1.61")  # Fiber since 1.62.0.
     conflicts("cxxstd=98", when="+fiber")  # Fiber requires >=C++11.
     conflicts("~context", when="+fiber")  # Fiber requires Context.
 
@@ -319,6 +321,9 @@ def libs(self):
     # boost-mpi depends on boost-python since 1.87.0
     conflicts("~python", when="+mpi @1.87.0:")
 
+    # Container's Extended Allocators were not added until 1.56.0
+    conflicts("+container", when="@:1.55")
+
     # Boost.System till 1.76 (included) was relying on mutex, which was not
     # detected correctly on Darwin platform when using GCC
     #
@@ -519,6 +524,23 @@ def patch(self):
         if self.spec.satisfies("@1.78 %intel") or self.spec.satisfies("@1.78 %oneapi"):
             filter_file("-static", "", "tools/build/src/engine/build.sh")
 
+        # bjam's own build engine (tools/build/src/engine) is bootstrapped
+        # TWICE: once directly via a bare "gcc" call in build.sh to produce
+        # bootstrap/jam0, then AGAIN by jam0 itself running its own Jam
+        # rules to produce the real b2 -- a CFLAGS/toolset override only
+        # reaches the first stage, not the second. modules/path.c calls
+        # file_query() (properly declared in filesys.h) without including
+        # that header; GCC 14 makes implicit-function-declaration a hard
+        # error by default where older GCC only warned. Fixing the actual
+        # missing include covers both compile stages at once.
+        if self.spec.satisfies("@1.56.0"):
+            filter_file(
+                '#include "../timestamp.h"',
+                '#include "../timestamp.h"\n#include "../filesys.h"',
+                "tools/build/src/engine/modules/path.c",
+                string=True,
+            )
+
     def url_for_version(self, version):
         if version >= Version("1.63.0"):
             url = "https://archives.boost.io/release/{0}/source/boost_{1}.tar.bz2"