From nobody Sun Jun 25 20:58:11 2023 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 4Qq3GW5G2Yz4j2mR; Sun, 25 Jun 2023 20:58:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qq3GW4Wg0z3vnp; Sun, 25 Jun 2023 20:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687726691; 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=ACtZk70iqRYu+LWcPc7/CnNy+uR4T3uWM0vuwlhbWok=; b=Z3qX/nVVyd9UsDIgZ+rdXd6Lxz32wpahdA2mDhzLD1zwELEIo3UgCbCN4Y1a+A2P8lEfl6 zTAY/36FDnZqcyeXCgQuB92b6GCfl+nQkUEBNJnY7xFtb2VcoemOw68PsdNRCmrCFu4d8z B8M8MkgLuAZ5Ff8h0V9xbfJ8BumgVRknUe4bntzCMCtujYoguXlpomqHtmj657Yde9FsSx yjTbcRPorRyihT8mcRHQcD6QpjQtdMpwtrfUOZsQbEGyZiBFZezl5YzuYQ7I1JiXKQvufG b02HiQeNe5e/cUUINoJSyaf5piy2I+4Il93gOH9ZgySRTE/s9wu41raV7SLktw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687726691; 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=ACtZk70iqRYu+LWcPc7/CnNy+uR4T3uWM0vuwlhbWok=; b=pfgam8wm1fmT8cs5GB4g8G0QVa8wBThfjY3ApQUqv4uaD9C3CV2PSfbEaMwyD/XKf5+AnY Sv4drVuc92p4esemUT8cRwpfvQs9m9hP0DmKI/V6SWCSACvA2hjGm1bPcRsiEsfimtpsON ja2VlfjWbrcTRppKJhRyfGy+SbqyVHcIekwq1PKDlVJRl3GR0/tEJwqBNAZzkiKmZn6U74 GKfTr0L8FFdjBsE3iXURWcQcs4OZvDdCkdM1MQtWhjpdmkd7vtra1HZ5r0PKvjJVW5Dw4X CFoMcRQp65273otImu7zs3by3JYkAtiTZ58JUxJ53Gdrhirzyc6SPkXRmKqbFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687726691; a=rsa-sha256; cv=none; b=sLWyEJtvRYvFL9dAN58lqnmhvmwu51GyVu3q/2B7eVibaQtmql74T2lY6d20fOBM5+kezG 4PAfcsV8Przo6Mpt9QCHzgYDALtXsvKVecPXhVbrBsr7GGrnoaRf6fdXCN8euytpiGiUT5 QnNdcJTQ5KEmSP7Tp0+CuHQSzwcOBFFEGRI8BYgco9T1nslH5J1XaLpFf9jqZH7i5xasfJ 7VEBscqx9VkZt1p0SVxlDkMYGFA+ijyc3dEorNb3qdFkogpEL4cynH0N8R+gkWeWfQYxXq jIrX0xZw2kmi6Ax75Vp4YnoJMJFvUM+wSss75igAQEAzClY8W/6XxgB7b9NiHw== 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 4Qq3GW3SY2zj7S; Sun, 25 Jun 2023 20:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35PKwBSC074844; Sun, 25 Jun 2023 20:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35PKwBfE074843; Sun, 25 Jun 2023 20:58:11 GMT (envelope-from git) Date: Sun, 25 Jun 2023 20:58:11 GMT Message-Id: <202306252058.35PKwBfE074843@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 8b109070f7a1 - main - devel/cbang: fix the build with clang 16 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b109070f7a17b38b78a4c21b080d02650f9f65e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b109070f7a17b38b78a4c21b080d02650f9f65e commit 8b109070f7a17b38b78a4c21b080d02650f9f65e Author: Thierry Thomas AuthorDate: 2023-06-25 20:53:26 +0000 Commit: Thierry Thomas CommitDate: 2023-06-25 20:58:08 +0000 devel/cbang: fix the build with clang 16 Do not force clang 15, but apply a patch provided by dim@ for the first error, and other patches from boost upstream, pointed out by dim@ in https://github.com/CauldronDevelopmentLLC/cbang/issues/119#issuecomment-1606232478 PR: 271047 --- devel/cbang/Makefile | 13 ++---------- .../patch-src_boost_boost_container__hash_hash.hpp | 23 ++++++++++++++++++++++ ...meric_conversion_detail_int__float__mixture.hpp | 23 ++++++++++++++++++++++ ...ost_numeric_conversion_detail_sign__mixture.hpp | 23 ++++++++++++++++++++++ ...ric_conversion_detail_udt__builtin__mixture.hpp | 23 ++++++++++++++++++++++ 5 files changed, 94 insertions(+), 11 deletions(-) diff --git a/devel/cbang/Makefile b/devel/cbang/Makefile index 366723807e85..7fa4ead2f66e 100644 --- a/devel/cbang/Makefile +++ b/devel/cbang/Makefile @@ -36,6 +36,7 @@ MAKE_ARGS+= cc="${CC}" \ cxx="${CXX}" \ ccflags="${CCFLAGS}" \ cxxflags="${CXXFLAGS}" \ + cxxstd="c++17" \ libpath="/lib" \ sharedlib=1 \ prefix="${STAGEDIR}${PREFIX}" \ @@ -51,16 +52,6 @@ PLIST_SUB= VER=${LIBVER} TEST_WRKSRC= ${WRKSRC}/tests DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS} -.include - -.if ${COMPILER_VERSION} >= 160 -# See https://github.com/CauldronDevelopmentLLC/cbang/issues/119 -BUILD_DEPENDS+= clang15:devel/llvm15 -CPP= clang-cpp15 -CC= clang15 -CXX= clang++15 -.endif - pre-configure: ${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ ${TEST_WRKSRC}/testHarness @@ -82,4 +73,4 @@ post-install: do-test: (cd ${TEST_WRKSRC} && ${DO_MAKE_TEST} && ./testHarness) -.include +.include diff --git a/devel/cbang/files/patch-src_boost_boost_container__hash_hash.hpp b/devel/cbang/files/patch-src_boost_boost_container__hash_hash.hpp new file mode 100644 index 000000000000..13713185011f --- /dev/null +++ b/devel/cbang/files/patch-src_boost_boost_container__hash_hash.hpp @@ -0,0 +1,23 @@ +--- src/boost/boost/container_hash/hash.hpp.orig 2023-03-09 16:36:47 UTC ++++ src/boost/boost/container_hash/hash.hpp +@@ -118,20 +118,12 @@ namespace boost + { + namespace hash_detail + { +-#if defined(_HAS_AUTO_PTR_ETC) && !_HAS_AUTO_PTR_ETC + template + struct hash_base + { + typedef T argument_type; + typedef std::size_t result_type; + }; +-#else +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +- template +- struct hash_base : std::unary_function {}; +-#pragma GCC diagnostic pop +-#endif + + struct enable_hash_value { typedef std::size_t type; }; + diff --git a/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_int__float__mixture.hpp b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_int__float__mixture.hpp new file mode 100644 index 000000000000..0ed51bc4eab0 --- /dev/null +++ b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_int__float__mixture.hpp @@ -0,0 +1,23 @@ +--- src/boost/boost/numeric/conversion/detail/int_float_mixture.hpp.orig 2023-03-09 16:36:47 UTC ++++ src/boost/boost/numeric/conversion/detail/int_float_mixture.hpp +@@ -16,15 +16,15 @@ + #include "boost/numeric/conversion/int_float_mixture_enum.hpp" + #include "boost/numeric/conversion/detail/meta.hpp" + +-#include "boost/mpl/integral_c.hpp" ++#include "boost/type_traits/integral_constant.hpp" + + namespace boost { namespace numeric { namespace convdetail + { + // Integral Constants for 'IntFloatMixture' +- typedef mpl::integral_c int2int_c ; +- typedef mpl::integral_c int2float_c ; +- typedef mpl::integral_c float2int_c ; +- typedef mpl::integral_c float2float_c ; ++ typedef boost::integral_constant int2int_c ; ++ typedef boost::integral_constant int2float_c ; ++ typedef boost::integral_constant float2int_c ; ++ typedef boost::integral_constant float2float_c ; + + // Metafunction: + // diff --git a/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_sign__mixture.hpp b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_sign__mixture.hpp new file mode 100644 index 000000000000..7d5876ed2468 --- /dev/null +++ b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_sign__mixture.hpp @@ -0,0 +1,23 @@ +--- src/boost/boost/numeric/conversion/detail/sign_mixture.hpp.orig 2023-03-09 16:36:47 UTC ++++ src/boost/boost/numeric/conversion/detail/sign_mixture.hpp +@@ -16,15 +16,15 @@ + #include "boost/numeric/conversion/sign_mixture_enum.hpp" + #include "boost/numeric/conversion/detail/meta.hpp" + +-#include "boost/mpl/integral_c.hpp" ++#include "boost/type_traits/integral_constant.hpp" + + namespace boost { namespace numeric { namespace convdetail + { + // Integral Constants for 'SignMixture' +- typedef mpl::integral_c unsig2unsig_c ; +- typedef mpl::integral_c sig2sig_c ; +- typedef mpl::integral_c sig2unsig_c ; +- typedef mpl::integral_c unsig2sig_c ; ++ typedef boost::integral_constant unsig2unsig_c ; ++ typedef boost::integral_constant sig2sig_c ; ++ typedef boost::integral_constant sig2unsig_c ; ++ typedef boost::integral_constant unsig2sig_c ; + + // Metafunction: + // diff --git a/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_udt__builtin__mixture.hpp b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_udt__builtin__mixture.hpp new file mode 100644 index 000000000000..0683f76f2cdd --- /dev/null +++ b/devel/cbang/files/patch-src_boost_boost_numeric_conversion_detail_udt__builtin__mixture.hpp @@ -0,0 +1,23 @@ +--- src/boost/boost/numeric/conversion/detail/udt_builtin_mixture.hpp.orig 2023-03-09 16:36:47 UTC ++++ src/boost/boost/numeric/conversion/detail/udt_builtin_mixture.hpp +@@ -15,15 +15,15 @@ + #include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp" + #include "boost/numeric/conversion/detail/meta.hpp" + +-#include "boost/mpl/integral_c.hpp" ++#include "boost/type_traits/integral_constant.hpp" + + namespace boost { namespace numeric { namespace convdetail + { + // Integral Constants for 'UdtMixture' +- typedef mpl::integral_c builtin2builtin_c ; +- typedef mpl::integral_c builtin2udt_c ; +- typedef mpl::integral_c udt2builtin_c ; +- typedef mpl::integral_c udt2udt_c ; ++ typedef boost::integral_constant builtin2builtin_c ; ++ typedef boost::integral_constant builtin2udt_c ; ++ typedef boost::integral_constant udt2builtin_c ; ++ typedef boost::integral_constant udt2udt_c ; + + // Metafunction: + //