<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7030333817631c8231edf959269de6472bb6f705">https://github.com/macports/macports-ports/commit/7030333817631c8231edf959269de6472bb6f705</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 70303338176 boost187: fix build for older macOS versions
</span>70303338176 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7030333817631c8231edf959269de6472bb6f705
</span>Author: Bjarne D Mathiesen <macintosh@mathiesen.info>
AuthorDate: Wed Jun 18 20:54:02 2025 +0200
<span style='display:block; white-space:pre;color:#404040;'> boost187: fix build for older macOS versions
</span>---
devel/boost187/Portfile | 56 +++++++--
devel/boost187/files/patch-fix-environ.diff | 135 +++++++++++++++++++++
devel/boost187/files/patch-interprocess.diff | 34 ++++++
devel/boost187/files/patch-legacysupport.diff | 11 ++
...atch-libs_process_src_posix_close__handles.diff | 24 ++++
.../files/patch-process-PROC_PPID_ONLY.diff | 33 +++++
devel/boost187/files/patch-test-PRIxPTR.diff | 60 +++++++++
7 files changed, 340 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/Portfile b/devel/boost187/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45d9fbda132..91d660a47a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost187/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.1
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
# Needed for: TARGET_OS_IOS, dirfd
legacysupport.newest_darwin_requires_legacy 14
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +61,14 @@ post-extract {
</span> }
# Enforce correct compiler and flags are used to build b2
xinstall -m 755 -d ${workpath}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cxx} ${workpath}/bin/clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cc} ${workpath}/bin/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also link gcc/g++ for older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/63120
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cxx} ${workpath}/bin/g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cc} ${workpath}/bin/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.cxx} ${workpath}/bin/clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.cc} ${workpath}/bin/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.cxx} ${workpath}/bin/g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.cc} ${workpath}/bin/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.env-append PATH=${workpath}/bin:$env(PATH)
build.env-append PATH=${workpath}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +124,22 @@ post-patch {
</span> # ld: internal error: atom not found in symbolIndex(__ZNSt3__1plIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_12basic_stringIT_T0_T1_EERKS9_SB_) for architecture x86_64
patchfiles-append patch-b2-build-older-OSes.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/test/pull/437
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/test/pull/438
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-test-PRIxPTR.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/process/issues/452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-process-PROC_PPID_ONLY.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/process/issues/453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-environ.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/process/issues/461
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libs_process_src_posix_close__handles.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/boostorg/interprocess/issues/248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-interprocess.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc write_jam s {
global worksrcpath
set config [open ${worksrcpath}/user-config.jam a]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,6 +176,15 @@ configure.args --without-libraries=python \
</span> --without-libraries=mpi \
--with-icu=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-legacysupport.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # boost build scripts default to clang on darwin
if {[string match *gcc* ${configure.compiler}]} {
configure.args-append --with-toolset=gcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -355,18 +382,18 @@ subport ${name}-numpy {
</span> }
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
patchfiles-append patch-disable-numpy-extension.diff
variant regex_match_extra description \
"Enable access to extended capture information of submatches in Boost.Regex" {
notes-append "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- You enabled the +regex_match_extra variant\; see the following page for an\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exhaustive list of the consequences of this feature:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You enabled the +regex_match_extra variant\; see the following page for\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ an exhaustive list of the consequences of this feature:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.boost.org/doc/libs/${distver}/libs/regex/doc/html/boost_regex/ref/sub_match.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.boost.org/doc/libs/${distver}/libs/regex/doc/html/boost_regex/ref/sub_match.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span>
post-patch {
reinplace {/#define BOOST_REGEX_MATCH_EXTRA/s:^// ::} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,7 +449,9 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url http://www.boost.org/users/download/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex Version (\\d+\\.\\d+\\.\\d+)</span>
</span> } else {
post-destroot {
move {*}[glob ${destroot}${bprefix}/lib/libboost_numpy*] ${destroot}${bprefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -502,6 +531,7 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: Is this even needed? Is this correct for ppc64?
</span> platform powerpc {
build.args-append --disable-long-double
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-fix-environ.diff b/devel/boost187/files/patch-fix-environ.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d1c50cdf985
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-fix-environ.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,135 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 94aa3b6b43cccdda370ebbef6b2e6fd603c3d922 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Klemens Morgenstern <klemens.morgenstern@gmx.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 27 Feb 2025 10:13:22 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fixed environ for OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+closes #453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../boost/process/v1/detail/posix/environment.hpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/boost/process/v1/detail/posix/executor.hpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/boost/process/v1/extend.hpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../boost/process/v2/detail/environment_posix.hpp | 9 +++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/boost/process/v2/posix/default_launcher.hpp | 12 ++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/detail/environment_posix.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 21 insertions(+), 12 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/process/v1/detail/posix/environment.hpp b/include/boost/process/v1/detail/posix/environment.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6ddfc559c..64bb63556 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/process/v1/detail/posix/environment.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/process/v1/detail/posix/environment.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@ class native_environment_impl<char>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using string_type = std::basic_string<char_type>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using native_handle_type = char_type **;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void reload() {this->_env_impl = ::environ;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void reload() {this->_env_impl = environ;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string_type get(const pointer_type id) { return getenv(id); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void set(const pointer_type id, const pointer_type value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +136,7 @@ class native_environment_impl<char>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ native_environment_impl & operator=(native_environment_impl && ) = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ native_handle_type _env_impl = environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- native_handle_type native_handle() const {return ::environ;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ native_handle_type native_handle() const {return environ;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/process/v1/detail/posix/executor.hpp b/include/boost/process/v1/detail/posix/executor.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cc1bcb6cf..b462e41d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/process/v1/detail/posix/executor.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/process/v1/detail/posix/executor.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,7 +275,7 @@ class executor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prepare_cmd_style_fn = exe;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((prepare_cmd_style_fn.find('/') == std::string::npos) && ::access(prepare_cmd_style_fn.c_str(), X_OK))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const auto * e = ::environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto * e = environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((e != nullptr) && (*e != nullptr) && !boost::starts_with(*e, "PATH="))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,7 +316,7 @@ class executor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char * exe = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *const* cmd_line = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool cmd_style = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **env = ::environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char **env = environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pid_t pid = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/process/v1/extend.hpp b/include/boost/process/v1/extend.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 185972225..cb7b05c79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/process/v1/extend.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/process/v1/extend.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,7 +249,7 @@ struct posix_executor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///A pointer to the argument-vector.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *const* cmd_line = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///A pointer to the environment variables, as default it is set to [environ](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **env = ::environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char **env = environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///The pid of the process - it will be -1 before invoking [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html), and after forking either 0 for the new process or a positive value if in the current process. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pid_t pid = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/process/v2/detail/environment_posix.hpp b/include/boost/process/v2/detail/environment_posix.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 756432d66..becd9f3e8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/process/v2/detail/environment_posix.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/process/v2/detail/environment_posix.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,8 +14,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/process/v2/detail/config.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/process/v2/cstring_ref.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" { extern char **environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if !defined(environ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern "C" { extern char **environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOST_PROCESS_V2_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/process/v2/posix/default_launcher.hpp b/include/boost/process/v2/posix/default_launcher.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d17bda5e7..fc826fea2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/process/v2/posix/default_launcher.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/process/v2/posix/default_launcher.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,9 +30,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" { extern char **environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if !defined(environ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern "C" { extern char **environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOST_PROCESS_V2_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +264,7 @@ inline void on_exec_error(Launcher & launcher, const filesystem::path &executabl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct default_launcher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// The pointer to the environment forwarded to the subprocess.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char * const * env = ::environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char * const * env = environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// The pid of the subprocess - will be assigned after fork.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int pid = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/detail/environment_posix.cpp b/src/detail/environment_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a7913671..5c2f81260 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/process/src/detail/environment_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/process/src/detail/environment_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@ void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key, error_c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-native_handle_type load_native_handle() { return ::environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++native_handle_type load_native_handle() { return environ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ native_iterator next(native_iterator nh)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-interprocess.diff b/devel/boost187/files/patch-interprocess.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..23a19f63ad5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-interprocess.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 061bc6f8dfc2af90d9996a77317b21398f6bdda5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Mar 2025 23:23:56 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fixes #248 ("gcc-14 errors out on segment_manager_helper.hpp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error: no matching function...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../boost/interprocess/detail/segment_manager_helper.hpp | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/interprocess/detail/segment_manager_helper.hpp b/include/boost/interprocess/detail/segment_manager_helper.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d47e4aa..de788ce8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/interprocess/detail/segment_manager_helper.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/interprocess/detail/segment_manager_helper.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@ struct block_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOST_ASSERT(namelen == m_num_char);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return get_rounded_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( size_type(sizeof(Header))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- , size_type(::boost::container::dtl::alignment_of<block_header<size_type> >::value))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ , size_type(::boost::container::dtl::alignment_of<block_header<size_type> >::value))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + this->template total_named_size<0, char>(namelen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -392,7 +392,9 @@ struct block_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_type name_length_offset() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return this->value_offset() + get_rounded_size(m_value_bytes, ::boost::move_detail::alignment_of<name_len_t>::value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return this->value_offset() +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_rounded_size( size_type(m_value_bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ , size_type(::boost::move_detail::alignment_of<name_len_t>::value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-legacysupport.diff b/devel/boost187/files/patch-legacysupport.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..92c83000897
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-legacysupport.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bootstrap.sh.orig 2024-12-05 08:53:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bootstrap.sh 2025-01-17 13:16:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,7 +226,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$BJAM" = x; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $ECHO "Building B2 engine.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" --cxxflags="-isystem@PREFIX@/include/LegacySupport -Wl,-lMacportsLegacySupport" ${TOOLSET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Failed to build B2 build engine"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-libs_process_src_posix_close__handles.diff b/devel/boost187/files/patch-libs_process_src_posix_close__handles.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6c03037d7ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-libs_process_src_posix_close__handles.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d7df711628fc69e133caeb3fc3ee8434213ef81b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Klemens Morgenstern <klemens.morgenstern@gmx.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 27 Feb 2025 10:12:55 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] remove `::` from `dirfd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+closes #461
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/posix/close_handles.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/v1/limit_fd.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/posix/close_handles.cpp b/src/posix/close_handles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0da2b755e..5795a3b1c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/process/src/posix/close_handles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/process/src/posix/close_handles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +185,7 @@ void close_all(const std::vector<int> & whitelist, error_code & ec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto dir_fd = ::dirfd(dir.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto dir_fd = dirfd(dir.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dir_fd == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-process-PROC_PPID_ONLY.diff b/devel/boost187/files/patch-process-PROC_PPID_ONLY.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a80b120e04b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-process-PROC_PPID_ONLY.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0ca663c8262b65ccee9a4e6abbafaef710f6b36f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Klemens Morgenstern <klemens.morgenstern@gmx.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 26 Jan 2025 21:49:25 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Set ENOTSUP when PROC_PPID_ONLY is undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+closes #452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/pid.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/pid.cpp b/src/pid.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7fa5f822c..322405907 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/process/src/pid.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/process/src/pid.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,6 +178,8 @@ pid_type parent_pid(pid_type pid, error_code & ec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<pid_type> child_pids(pid_type pid, error_code & ec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<pid_type> vec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(PROC_PPID_ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vec.resize(proc_listpids(PROC_PPID_ONLY, (uint32_t)pid, nullptr, 0) / sizeof(pid_type));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const auto sz = proc_listpids(PROC_PPID_ONLY, (uint32_t)pid, &vec[0], sizeof(pid_type) * vec.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sz < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,6 +188,9 @@ std::vector<pid_type> child_pids(pid_type pid, error_code & ec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vec.resize(sz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, system_category());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return vec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost187/files/patch-test-PRIxPTR.diff b/devel/boost187/files/patch-test-PRIxPTR.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..324bee89db0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost187/files/patch-test-PRIxPTR.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cc04b75a1b4e20e57b6dbad60a758d61074bb887 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Matt Borland <matt@mattborland.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 22 Jan 2025 11:41:14 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add additional paths to guarantee BOOST_TEST_PRIxPTR is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/boost/test/impl/execution_monitor.ipp | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 848670b80c..7753ed7854 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +207,18 @@ namespace { void _set_se_translator( void* ) {} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef BOOST_TEST_DEFINED_STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// If any modern toolchain did not pick up a definition from above it will here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BOOST_TEST_PRIxPTR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef __has_include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if __has_include(<cinttypes>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <cinttypes>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define BOOST_TEST_PRIxPTR PRIxPTR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Last resort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BOOST_TEST_PRIxPTR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define BOOST_TEST_PRIxPTR "08lx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d19ff0b661e94f9f518e30b6303f5596199ef26d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 27 Jan 2025 04:22:28 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] execution_monitor.ipp: follow-up fix for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This fixes https://github.com/boostorg/test/issues/436
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/boost/test/impl/execution_monitor.ipp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/boost/test/impl/execution_monitor.ipp include/boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7753ed78..8d7500af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boost/test/impl/execution_monitor.ipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,8 +195,8 @@ namespace { void _set_se_translator( void* ) {} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (!defined(BOOST_MSSTL_VERSION) || (BOOST_MSSTL_VERSION >= 120)) && (!defined(__GLIBC__) || ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 2))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// glibc 2.2 - 2.17 required __STDC_FORMAT_MACROS to be defined for use of PRIxPTR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(__GLIBC__) && !((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 18)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// glibc 2.2 - 2.17 required __STDC_FORMAT_MACROS to be defined for use of PRIxPTR, as well as some versions of macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if (defined(__GLIBC__) && !((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 18)))) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __STDC_FORMAT_MACROS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define BOOST_TEST_DEFINED_STDC_FORMAT_MACROS
</span></pre><pre style='margin:0'>
</pre>