From nobody Sun Jun 25 18:44:27 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 4Qq0JD0NH0z4hhyt; Sun, 25 Jun 2023 18:44:28 +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 4Qq0JC73GHz44CY; Sun, 25 Jun 2023 18:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687718668; 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=jVtJBDu8qCnzNMiV1tFhvP2mHEBRJTiByS8fkme6qUw=; b=joeZfYcyaDN+bQC67tP/ihJB3t0qvSkYIc+kB7Vk4AtAtOc9r0kLCmh2y2jU+o8UoJa/hX cHI1KFbzowiGvAFjdnJusyuMa9mjuW7XTZ7u8hzISft5tg4TPCpY+RQbnNqQIu63Wx8tnH jwRvpsVo1iC0lVQfYkUKzCby5GLWAaL4J4EdU0tQ1dskNips10QCAB7u/ZXFoPLOa+/Eaq wdgAzSSiMpBj5jaJ0/SSVI2zC98zsbyBvJICUUqKxq8ZlzE55BdVZ4m5E77N8DBUFd+dfr T30FQLtRyPLERZqcoO25JXjdWbKCplkn6V6Ni+DvGX+NyJZOGHWtVBOB6OTI9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687718668; 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=jVtJBDu8qCnzNMiV1tFhvP2mHEBRJTiByS8fkme6qUw=; b=W16jw484RKS9BJWBHqQ0e3Ss2eFBRbhNGUKnDHvOxjLfr2RYRnibsTb0WFExx104M2h9vG JdbDG8dY5jt0dX1IJUodGrcIagnSkSEOyMhlOfRI5MGhu229iKV0kH9QZ1LEn/V+k4n1Rz aOxIPIWCh9bLzVhVCUUHBWhIRZ8vp6taXDNXUAWY4uBf/NtIUR4ZtkOJ5Lq3WRKnYAkAGc WCuo5Q/jIVmF+lLo7uBD7Izdhmsd82tuzL3LToZPk/954iuZEEWr5nrNWRIwnfxD2au5O9 g/k5Oq9VWKBzzEchOJCoM2mG5QtF4xJ91OmwJXQj9xO+HYEyz85I+8xUKdg9uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687718668; a=rsa-sha256; cv=none; b=NUrY9yvbX6Nnkw0Dj/Y5dqKItZgrtG5lb+cqKRjG3IoCAcX7OolSaKS537kKCmhXiPAppe DR77aEtAS8P2zvOeb2osZg64llkonJwjMZy9ES4+xnyWjtqtzF9L3sRR3J3BVWT8RawHSU QSkMtj1GozAu97P5w+DT2sIoUM2AOvptJzaVOmxBqrdIJF7Ruac1UoWxPFZNd7GXJYi9vK KXfr0c3ZOO7E/icHDh5eMsOe3/F0MJY6sTLcYb73+1vQs4Y31ZfaPU/c9frh9s1hKSzaJv sSxrvg6P60GVvWVc4Fn8GI5QhpMIHXQvq/4eL76pyXHJlGVt1dVtFhNtwwzIQg== 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 4Qq0JC62q5zf4n; Sun, 25 Jun 2023 18:44:27 +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 35PIiRkr057423; Sun, 25 Jun 2023 18:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35PIiR8q057422; Sun, 25 Jun 2023 18:44:27 GMT (envelope-from git) Date: Sun, 25 Jun 2023 18:44:27 GMT Message-Id: <202306251844.35PIiR8q057422@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: 16d1806c2683 - main - devel/cbang: uses clang 15 instead of 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: 16d1806c26831cf957741d530f0738404e223635 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=16d1806c26831cf957741d530f0738404e223635 commit 16d1806c26831cf957741d530f0738404e223635 Author: Thierry Thomas AuthorDate: 2023-06-25 18:41:24 +0000 Commit: Thierry Thomas CommitDate: 2023-06-25 18:44:23 +0000 devel/cbang: uses clang 15 instead of clang 16 See for details. PR: 271047 Reported by: pkg-fallout --- devel/cbang/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/devel/cbang/Makefile b/devel/cbang/Makefile index 930b020fa60f..366723807e85 100644 --- a/devel/cbang/Makefile +++ b/devel/cbang/Makefile @@ -25,6 +25,7 @@ GH_ACCOUNT= CauldronDevelopmentLLC USES= compiler:c++17-lang localbase mysql:client python:test scons \ sqlite ssl +USE_CXXSTD= gnu++17 USE_LDCONFIG= yes OPTIONS_DEFINE= DEBUG DOCS @@ -33,7 +34,6 @@ DEBUG_LIB_DEPENDS= libbfd.so:devel/libbfd MAKE_ARGS+= cc="${CC}" \ cxx="${CXX}" \ - cxxstd="c++17" \ ccflags="${CCFLAGS}" \ cxxflags="${CXXFLAGS}" \ libpath="/lib" \ @@ -51,6 +51,16 @@ 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 @@ -72,4 +82,4 @@ post-install: do-test: (cd ${TEST_WRKSRC} && ${DO_MAKE_TEST} && ./testHarness) -.include +.include