From nobody Thu Nov 21 08:45:51 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XvBdr0KXHz5fS15; Thu, 21 Nov 2024 08:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvBdq6dR4z55Rg; Thu, 21 Nov 2024 08:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732178751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/z4KddAWGQbeWqcZqLh++74rxuC4tb0ItoUCfjViIk=; b=nY7AGQ8r7ucbiHaZWP+ppp25fAD4A/xWGlujIiVmogYKVC1D+bYB1Yc1mWpONeydRQbBOt Vt60Kmm9Ve/bQgBKjYgnG1tm6mSMJZimH41+eZItcbsC4CIAcrzbnuFsG0UpUFz6Z9Rk7/ WFjo7ILf3MpVqKxX2FYuB0SPfmpBzI3pkfU0w6YxHb0Cdy+un+qD5KttWyel6Nuk0zj03P +DtAUHUEeVYgYryOuAN1cPDWraEx10tNlN3NMLxqgfOvl7XdJhFBbNr2N0afZs4mqcFT1G qxmsIB+vOjqfRUhlo/D583ZeLOar9arox8bMXRvHRi7tbBUL45VXZIJ0N/GklQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732178751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/z4KddAWGQbeWqcZqLh++74rxuC4tb0ItoUCfjViIk=; b=cWkWWlTjnkdXIp72luw2jvuE1UN1rWZkervI0EUbqw27Pokr16k23S/8eULspd7oBg+TYL r1rkwYV7FtYRMmp6ybeQ1e73Vh0MX2mxVofrJvVUER15iMUQU/olCBCn9Gppl6vShv8Sh4 VI+AX/XIXJ04jqe0ogn0ma0KAhMs2DALY9CspTahYKAxbOaQZRC2/nvfC8w7AU7aPfdOd1 TzXLCJ3gZO1OM+xVU/eKbpAjDOL9EEfnOA3lCD47qBB+qnITRCrB3xuopdOHVHqIlstlmU /han5D5t5ng+Krzoej9vAzmOTIGC5YeStFJx4quyL1OioOUW4X4v7/ANjnsJSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732178751; a=rsa-sha256; cv=none; b=UnCo1UqeaX7WQ1Bsr9DgU4Yv2QL4Id7KgLWG1xzLU0IuJA9kLMP0FWYh13lhKwQnfk1SGQ dTb1jUwSB8Ig13zh4uSsFu/ODgEUJuOBw/CW9XqQzOfO4+vEf1MoGwsVVJauvGWRjcTqob ZQlSSPn/mFxLrtksVCuCYjPgpxAMgQW3Bqhr4mgvQ+4ZO7fgipnjleAUvklMQQOxRcEjJP mbWtTNsarav287pNvmhNp/qG/YSeaux3m2Du7g8kpH8YOSRAZDIFgqL723mKMCKeMSlvz4 4buFP1dsApe1FQ4s23PYAhkdbQdbxXY6OhYVLIlPAMdE686vP1/sbHu1W5lDyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XvBdq5tDmzYBm; Thu, 21 Nov 2024 08:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AL8jp8i055251; Thu, 21 Nov 2024 08:45:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL8jpMi055248; Thu, 21 Nov 2024 08:45:51 GMT (envelope-from git) Date: Thu, 21 Nov 2024 08:45:51 GMT Message-Id: <202411210845.4AL8jpMi055248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 7cafccf61a1d - main - devel/boost-libs: do not try to build boost.stacktrace.from_exceptions on !amd64 (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cafccf61a1db589a66295cd2f8aa794a21c7968 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cafccf61a1db589a66295cd2f8aa794a21c7968 commit 7cafccf61a1db589a66295cd2f8aa794a21c7968 Author: Dima Panov AuthorDate: 2024-11-21 08:39:28 +0000 Commit: Dima Panov 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 +# 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 +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(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%%