From nobody Wed Sep 25 04:25:31 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 4XD3Ym0Tsfz5WYh8; Wed, 25 Sep 2024 04:25:32 +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 4XD3Yl6Nvmz4lqR; Wed, 25 Sep 2024 04:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727238331; 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=ZB2ZnlCNKnu6/pkIQ5XNcvh+tYbM1ukwJm++klOOMQA=; b=fLD5d2RNjbrEArT2GHvyexjFu4bkKDhzqp2nf006V+eViLR/EuQvx4WgxE5GbKwUJgoGcg u54WAq8GxUF8XKcqljLwSftEJrxV14uewmpTR+Dbcfil/iSepehlkjxc8GsPFDpIFDssl/ P/DPBXnXROfaAMQh4ooCth+3/1N5+9QZxHz/eDO7Th/Q08iyOQjmOYpfeROmXZtrrOQhtp H1hiFv+54uNeW9IkMO5ul8c5Xp1TaOslfNn0TC0ucjJNW8+I0gfE4si3bNHwAQSdv4Prlc Z7BKWfuaGdBPvIrsjMLx2+mrb1m6U9hdgdodmH0+EDqTwGxO9NPXU562kPi+Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727238331; a=rsa-sha256; cv=none; b=f3gWEEUHgz8LDRkWRiDlvhtwKVgYN0t0dOQ84ApH7FJIxIMMccHLm4vPKyOIYgMh909xKg iUweLHv92h6reC9Pq5c7Ftxd9QYqWQmoHM7AL4sIK1NeVYaChd47/NRx1zK+pvkXHn6may hNVF0wv4Mq3xP19Dh6EUmCJotyUv6ZQHxxD6SvhshiHKSK+YJ1+DUxFcRhVv9/MKHISCua WkMJBoIpDx7nAMJ/gbOg3GoJkhOAfez6dIx3fpjSnd/FZCwlaSuxiWf2rVYbNKMWeRSDXM l5aMLSAdzp+UY9AFWUBql2Ox37/Tt5WqIS/DaTAJrDVGx0HKUBFRmOSIQHDs4Q== 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=1727238331; 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=ZB2ZnlCNKnu6/pkIQ5XNcvh+tYbM1ukwJm++klOOMQA=; b=BQjJkIpd1w+PPqzm+/xxM+m512Qd1h532vc6glRFhgX9Zg6lUO5bYdZG2/brGwai68mAEl 5npQwP/57zeawR4iy43J+1y2K57dwuenhRVtEIw2MIiNc+uOWsSerkON+3x35FrziGPYnr OXBvCwn0hytqvjKX41CYAleSX2F4tr2RZYpT6YtYN5gcIDCX+7O5xTbYa7RaIHj5P76pye 7C5sVtNj1mpQXKuolAT/GRG9cDC3XPaOeuF0cgpuCMgzuZ3ncLBnyNVx2ppYAzT3MSFSMp +c2CWWulXiUdJPAEE5YB9lgyly1VT8yaY3bDfWa54Dhygg0loJhAiQqjLleIkg== 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 4XD3Yl5zwNzy2b; Wed, 25 Sep 2024 04:25:31 +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 48P4PVC8033755; Wed, 25 Sep 2024 04:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48P4PV1E033752; Wed, 25 Sep 2024 04:25:31 GMT (envelope-from git) Date: Wed, 25 Sep 2024 04:25:31 GMT Message-Id: <202409250425.48P4PV1E033752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 610b011fb307 - main - devel/catch: Convert REINPLACE_CMD to patch file 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 610b011fb307f0fd5c58d04632f09d1a5e1e9881 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=610b011fb307f0fd5c58d04632f09d1a5e1e9881 commit 610b011fb307f0fd5c58d04632f09d1a5e1e9881 Author: Po-Chuan Hsieh AuthorDate: 2024-09-25 04:13:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-25 04:22:26 +0000 devel/catch: Convert REINPLACE_CMD to patch file --- devel/catch/Makefile | 4 ---- devel/catch/files/patch-clang19 | 11 +++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/devel/catch/Makefile b/devel/catch/Makefile index d5c663b7c367..df4f7b4f3cea 100644 --- a/devel/catch/Makefile +++ b/devel/catch/Makefile @@ -23,10 +23,6 @@ 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 diff --git a/devel/catch/files/patch-clang19 b/devel/catch/files/patch-clang19 new file mode 100644 index 000000000000..672213fbe950 --- /dev/null +++ b/devel/catch/files/patch-clang19 @@ -0,0 +1,11 @@ +--- projects/CMakeLists.txt.orig 2022-10-16 09:02:17 UTC ++++ projects/CMakeLists.txt +@@ -354,7 +354,7 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|G + if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" ) + target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Wpedantic -Wmissing-declarations ) + if (CATCH_ENABLE_WERROR) +- target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas ) ++ target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas -Wno-error=c++20-extensions ) + endif() + endif() + # Clang specific options go here