From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19BE11581EE for ; Fri, 28 Mar 2025 19:48:20 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F2227343162 for ; Fri, 28 Mar 2025 19:48:19 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E3E061104B1; Fri, 28 Mar 2025 19:48:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D98391104B1 for ; Fri, 28 Mar 2025 19:48:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 952BC34311C for ; Fri, 28 Mar 2025 19:48:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F12801733 for ; Fri, 28 Mar 2025 19:48:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1743191274.cf40b4c4dbdd499bd3c88c3fbf6119dd2519d00b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.49.0-r1.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cf40b4c4dbdd499bd3c88c3fbf6119dd2519d00b X-VCS-Branch: master Date: Fri, 28 Mar 2025 19:48:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25aa0648-7c18-4e98-8db1-f4f63a125d21 X-Archives-Hash: 712865d95854f3164c7ca04d70ede687 commit: cf40b4c4dbdd499bd3c88c3fbf6119dd2519d00b Author: Stephen Reaves gmail com> AuthorDate: Tue Mar 25 23:15:20 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 28 19:47:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf40b4c4 dev-vcs/git: Use emesonargs instead of sed to disable coccinelle Bug: https://bugs.gentoo.org/952004 Signed-off-by: Stephen Reaves gmail.com> Closes: https://github.com/gentoo/gentoo/pull/41296 Signed-off-by: Sam James gentoo.org> dev-vcs/git/git-2.49.0-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-vcs/git/git-2.49.0-r1.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild index 47eece354ef0..386116e4e078 100644 --- a/dev-vcs/git/git-2.49.0-r1.ebuild +++ b/dev-vcs/git/git-2.49.0-r1.ebuild @@ -257,7 +257,9 @@ src_configure() { # otherwise. # # Fixes https://bugs.gentoo.org/952004 - sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die + emesonargs+=( + -Dcoccinelle=disabled + ) fi meson_src_configure