git: 7cafccf61a1d - main - devel/boost-libs: do not try to build boost.stacktrace.from_exceptions on !amd64 (+)

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7cafccf61a1db589a66295cd2f8aa794a21c7968

commit 7cafccf61a1db589a66295cd2f8aa794a21c7968
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-11-21 08:39:28 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-11-21 08:39:28 +0000

    devel/boost-libs: do not try to build boost.stacktrace.from_exceptions on !amd64 (+)
    
    Recently added Boost.Stacktrace.from_exceptions library is ready only for amd64 yet.
    Exclude it from the build on any other ARCHes now.
    
    While here, backport fix for interface change in Boost.UUID
    
    Reported by:    fallout
    
    Sponsored by:   Future Crew, LLC
---
 devel/boost-libs/Makefile                          |  9 +++++++
 .../files/patch-boost-1.86.0-uuid-compute-backport | 30 ++++++++++++++++++++++
 devel/boost-libs/pkg-plist                         | 18 ++++++-------
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 305b59a453b1..bb3b744c6749 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -58,6 +58,15 @@ ALL_TARGET=	stage
 
 .include <bsd.port.options.mk>
 
+# boost.stacktrace.from_exceptions is ready only for amd64 yet
+.if ${ARCH:Mamd64}
+PLIST_SUB+=	SFE=""
+.else
+MAKE_ARGS+=	boost.stacktrace.from_exception=off
+PLIST_SUB+=	SFE="@comment "
+
+.endif
+
 do-install:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET}
diff --git a/devel/boost-libs/files/patch-boost-1.86.0-uuid-compute-backport b/devel/boost-libs/files/patch-boost-1.86.0-uuid-compute-backport
new file mode 100644
index 000000000000..860d886a40de
--- /dev/null
+++ b/devel/boost-libs/files/patch-boost-1.86.0-uuid-compute-backport
@@ -0,0 +1,30 @@
+From 4ab28f5b879c8a2335b851f5338b9012f4466dd0 Mon Sep 17 00:00:00 2001
+From: sehe <github@sehe.nl>
+Date: Mon, 19 Aug 2024 17:42:31 +0200
+Subject: [PATCH] Update sha1.hpp for breaking interface change in Boost.UUID
+
+see https://github.com/boostorg/uuid/commit/0f843137a1a479797004f195ec615fdc6ac1c219
+---
+ boost/compute/detail/sha1.hpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git boost/compute/detail/sha1.hpp boost/compute/detail/sha1.hpp
+index 5afe5f9c4..24fde3cd1 100644
+--- boost/compute/detail/sha1.hpp
++++ boost/compute/detail/sha1.hpp
+@@ -37,12 +37,12 @@ class sha1 {
+         }
+ 
+         operator std::string() {
+-            unsigned int digest[5];
++            unsigned char digest[20];
+             h.get_digest(digest);
+ 
+             std::ostringstream buf;
+-            for(int i = 0; i < 5; ++i)
+-                buf << std::hex << std::setfill('0') << std::setw(8) << digest[i];
++            for(int i = 0; i < 20; ++i)
++                buf << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(digest[i]);
+ 
+             return buf.str();
+         }
diff --git a/devel/boost-libs/pkg-plist b/devel/boost-libs/pkg-plist
index 9b41b8d81fc5..c3a455bd18de 100644
--- a/devel/boost-libs/pkg-plist
+++ b/devel/boost-libs/pkg-plist
@@ -15943,10 +15943,10 @@ lib/cmake/boost_stacktrace_basic-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_basic
 lib/cmake/boost_stacktrace_basic-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_basic-config.cmake
 lib/cmake/boost_stacktrace_basic-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_basic-variant-shared.cmake
 lib/cmake/boost_stacktrace_basic-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_basic-variant-static.cmake
-lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_from_exception-config-version.cmake
-lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_from_exception-config.cmake
-lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_from_exception-variant-shared.cmake
-lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_from_exception-variant-static.cmake
+%%SFE%%lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_from_exception-config-version.cmake
+%%SFE%%lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_from_exception-config.cmake
+%%SFE%%lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_from_exception-variant-shared.cmake
+%%SFE%%lib/cmake/boost_stacktrace_from_exception-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_from_exception-variant-static.cmake
 lib/cmake/boost_stacktrace_noop-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_noop-config-version.cmake
 lib/cmake/boost_stacktrace_noop-%%BOOST_SHARED_LIB_VER%%/boost_stacktrace_noop-config.cmake
 lib/cmake/boost_stacktrace_noop-%%BOOST_SHARED_LIB_VER%%/libboost_stacktrace_noop-variant-shared.cmake
@@ -16143,11 +16143,11 @@ lib/libboost_stacktrace_basic.so
 lib/libboost_stacktrace_basic.so.%%BOOST_MAJOR_VER%%
 lib/libboost_stacktrace_basic.so.%%BOOST_MAJOR_VER%%.%%BOOST_MINOR_VER%%
 lib/libboost_stacktrace_basic.so.%%BOOST_SHARED_LIB_VER%%
-lib/libboost_stacktrace_from_exception.a
-lib/libboost_stacktrace_from_exception.so
-lib/libboost_stacktrace_from_exception.so.%%BOOST_MAJOR_VER%%
-lib/libboost_stacktrace_from_exception.so.%%BOOST_MAJOR_VER%%.%%BOOST_MINOR_VER%%
-lib/libboost_stacktrace_from_exception.so.%%BOOST_SHARED_LIB_VER%%
+%%SFE%%lib/libboost_stacktrace_from_exception.a
+%%SFE%%lib/libboost_stacktrace_from_exception.so
+%%SFE%%lib/libboost_stacktrace_from_exception.so.%%BOOST_MAJOR_VER%%
+%%SFE%%lib/libboost_stacktrace_from_exception.so.%%BOOST_MAJOR_VER%%.%%BOOST_MINOR_VER%%
+%%SFE%%lib/libboost_stacktrace_from_exception.so.%%BOOST_SHARED_LIB_VER%%
 lib/libboost_stacktrace_noop.a
 lib/libboost_stacktrace_noop.so
 lib/libboost_stacktrace_noop.so.%%BOOST_MAJOR_VER%%