From nobody Thu Sep 19 07:18:02 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 4X8Rgb1QwHz5XMfV; Thu, 19 Sep 2024 07:18:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8RgZ70G6z43dH; Thu, 19 Sep 2024 07:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726730283; 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=HMbwG7UtmWcsCqRD+8sW5xQIKC6LYIImnwsLKCLeYdk=; b=BT4hKqwdttrS9G4TkwSFis/X+BgLMVnwXxIDiEHZJbfLgakwzlmh7xNZstJlvV1yYhSRdU iF7kjHJ8b8DC9iYicNttj8IBNoK2DrJWM2v6S1yfLopaHOywB83zZMQEY/ym90BPDVPeUi DH5iH0b60CP83DR9mKj8Zvn6meymSxNXJcY0t8+PI7BcX5vAtcQbOe5jf+MfIIBfsPvYlB j4a52JcfYEEgF/iOSab0ovcykT8lCuHUJ1/9rN/G4g92fwLvD7W/EvnQ95v7VHFh2DyyUh dMSJyyQim+H7GnFlZmP2nZvvKJOahvvpj5IunLJXmkbFIX/KoGLBBDBZIi4q2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726730283; a=rsa-sha256; cv=none; b=DLfx6MWtS+xpIHa0jSILiEa6b9gyC723Lnn8TEWR1XGm+PqYF97QMdE0MSsG30zsYdvaPz buByGAqDnzGki1fLI0SWtDM85RweBnLwaH6z/zLbmaVz16sEhkI7w1ESNKjsxRh+4DxOjl WV1lsyJ7qgY/MB13zOboyW35R5IsyHwaapdyhRF2lYwgDuDI2iA6b/I9h7PLlzYMsCFvYk dZny6oDSvjx5raXDRIZ3L29LvWHJ5xSnFGfNme9sYgpr8dw4st7hsk4sRYkHA9EE/6yNxx SsO1184nuilOXKkklcq4JFK2lxNoET1F/iST8+ka7qpIhgLJUWCbR/F1rFVhQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726730283; 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=HMbwG7UtmWcsCqRD+8sW5xQIKC6LYIImnwsLKCLeYdk=; b=ereriV3zO/hN9V9Z4KG3/fT0Az5S2230K5nNRLhqqBg7dvasyORzUhNilI0xTO6SzTNumR j5aTBSwDwWL481GdCXIc3C1hbroM5wHPVTNlUTP1w20MWzi1kqRTS4InLWw6hkbXYzZDAt /qDt8a2BSNKqYUEdKrFxSKvwFOTGGyvxwb813+rwJzebiQVe+a+hSsXUEFUccJ/mfOstc4 CwMuqxWcaPN5QDjiRjhWGgcu9LWVPNO5z3/IVheqJo51gJA7fMXjYrFlrQmkD8fkCM4RTI w8Kk/pwjAeMOJvNlhZxP3wUBgGuwYUaVRDIwarCVck66V70oeYxNkQq3Mi2VtQ== 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 4X8RgZ6HYQzwWQ; Thu, 19 Sep 2024 07:18:02 +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 48J7I2rJ003770; Thu, 19 Sep 2024 07:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48J7I2QX003767; Thu, 19 Sep 2024 07:18:02 GMT (envelope-from git) Date: Thu, 19 Sep 2024 07:18:02 GMT Message-Id: <202409190718.48J7I2QX003767@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 4793dab96482 - main - devel/catch: fix build with clang 19 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4793dab964826c99c0c9e4143fe49c0a9c1d47d1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=4793dab964826c99c0c9e4143fe49c0a9c1d47d1 commit 4793dab964826c99c0c9e4143fe49c0a9c1d47d1 Author: Dimitry Andric AuthorDate: 2024-09-15 15:57:45 +0000 Commit: Dimitry Andric CommitDate: 2024-09-19 07:11:08 +0000 devel/catch: fix build with clang 19 Clang 19 has become more strict about C++ extensions, which results in: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/Class.tests.cpp:83:1: error: passing no argument for the '...' parameter of a variadic macro is a C++20 extension [-Werror,-Wc++20-extensions] 83 | TEMPLATE_TEST_CASE_METHOD(Template_Fixture, "A TEMPLATE_TEST_CASE_METHOD based test run that succeeds", "[class][template]", int, float, double) { | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/catch.hpp:257:53: note: expanded from macro 'TEMPLATE_TEST_CASE_METHOD' 257 | #define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_test_registry.h:302:9: note: expanded from macro 'INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD' 302 | INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_test_registry.h:279:13: note: expanded from macro 'INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2' 279 | INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\ | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_preprocessor.hpp:217:465: note: expanded from macro 'INTERNAL_CATCH_NTTP_GEN' 217 | #define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0) | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_preprocessor.hpp:100:9: note: macro 'INTERNAL_CATCH_VA_NARGS_IMPL' defined here 100 | #define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N | ^ This can be fixed by adding -Wno-error=c++20-extensions, which is supported by both clang and gcc. Unfortunately adding it to CXXFLAGS does not work, since that is prepended to the compiler flags in CMakeLists.txt, so -Werror comes after it. Therefore, patch the appropriate CMakeLists.txt file. PR: 281519 Approved by: sunpoet (maintainer) MFH: 2024Q3 --- devel/catch/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devel/catch/Makefile b/devel/catch/Makefile index df4f7b4f3cea..d5c663b7c367 100644 --- a/devel/catch/Makefile +++ b/devel/catch/Makefile @@ -23,6 +23,10 @@ PORTSCOUT= limit:^2\. OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's/\(-Wno-error=pragmas\)/\1 -Wno-error=c++20-extensions/' \ + ${WRKSRC}/projects/CMakeLists.txt + do-test: ${BUILD_WRKSRC}/projects/SelfTest