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 638F31580E0 for ; Thu, 30 Jan 2025 00:40:47 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4A90C3430D7 for ; Thu, 30 Jan 2025 00:40:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 38F891103B6; Thu, 30 Jan 2025 00:40:46 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 2EA0E1103B6 for ; Thu, 30 Jan 2025 00:40:46 +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 D25D13430DE for ; Thu, 30 Jan 2025 00:40:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D3F411A7 for ; Thu, 30 Jan 2025 00:40:44 +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: <1738197621.ce19ef933625f7cb551cc3c8f5d5d8e3dc30fa4a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/, dev-vcs/git/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/files/git-2.48.1-parallel-build.patch dev-vcs/git/git-2.48.1.ebuild X-VCS-Directories: dev-vcs/git/ dev-vcs/git/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ce19ef933625f7cb551cc3c8f5d5d8e3dc30fa4a X-VCS-Branch: master Date: Thu, 30 Jan 2025 00:40:44 +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: eb1ff28f-7b83-4f3e-bf16-2cce82f486ec X-Archives-Hash: c1f3ada4e358d06f4a52b43f65c244c9 commit: ce19ef933625f7cb551cc3c8f5d5d8e3dc30fa4a Author: Sam James gentoo org> AuthorDate: Thu Jan 30 00:20:30 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 30 00:40:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce19ef93 dev-vcs/git: backport parallel build fix Closes: https://bugs.gentoo.org/948865 Signed-off-by: Sam James gentoo.org> dev-vcs/git/files/git-2.48.1-parallel-build.patch | 85 +++++++++++++++++++++++ dev-vcs/git/git-2.48.1.ebuild | 1 + 2 files changed, 86 insertions(+) diff --git a/dev-vcs/git/files/git-2.48.1-parallel-build.patch b/dev-vcs/git/files/git-2.48.1-parallel-build.patch new file mode 100644 index 000000000000..fb10f59b2d0f --- /dev/null +++ b/dev-vcs/git/files/git-2.48.1-parallel-build.patch @@ -0,0 +1,85 @@ +https://bugs.gentoo.org/948865 +https://lore.kernel.org/git/20250122-b4-pks-meson-additions-v3-4-5a51eb5d3dcd@pks.im/ + +From: Patrick Steinhardt +Date: Wed, 22 Jan 2025 13:05:47 +0100 +Subject: [PATCH v3 04/11] meson: fix dependencies for generated headers +Precedence: bulk +X-Mailing-List: git@vger.kernel.org +List-Id: +List-Subscribe: +List-Unsubscribe: +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 7bit +Message-Id: <20250122-b4-pks-meson-additions-v3-4-5a51eb5d3dcd@pks.im> +References: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im> +In-Reply-To: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im> +To: git@vger.kernel.org +Cc: Evan Martin , + Eli Schwartz , Junio C Hamano , + M Hickford , Toon Claes +X-Mailer: b4 0.14.2 + +We generate a couple of headers from our documentation. These headers +are added to the libgit sources, but two of them aren't used by the +library, but instead by our builtins. This can cause parallel builds to +fail because the builtin object may be compiled before the header was +generated. + +Fix the issue by adding both "config-list.h" and "hook-list.h" to the +list of builtin sources. While "command-list.h" is generated similarly, +it is used by "help.c" and thus part of the libgit sources indeed. + +Reported-by: Evan Martin +Signed-off-by: Patrick Steinhardt +--- + meson.build | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/meson.build b/meson.build +index 213998986e..4053024dad 100644 +--- a/meson.build ++++ b/meson.build +@@ -487,6 +487,13 @@ libgit_sources = [ + 'xdiff/xutils.c', + ] + ++libgit_sources += custom_target( ++ input: 'command-list.txt', ++ output: 'command-list.h', ++ command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'], ++ env: script_environment, ++) ++ + builtin_sources = [ + 'builtin/add.c', + 'builtin/am.c', +@@ -614,14 +621,7 @@ builtin_sources = [ + 'builtin/write-tree.c', + ] + +-libgit_sources += custom_target( +- input: 'command-list.txt', +- output: 'command-list.h', +- command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'], +- env: script_environment, +-) +- +-libgit_sources += custom_target( ++builtin_sources += custom_target( + output: 'config-list.h', + command: [ + shell, +@@ -632,7 +632,7 @@ libgit_sources += custom_target( + env: script_environment, + ) + +-libgit_sources += custom_target( ++builtin_sources += custom_target( + input: 'Documentation/githooks.txt', + output: 'hook-list.h', + command: [ + +-- +2.48.1.321.gbf1f004a4a.dirty diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild index f90f10f55f15..12b9dd2011c3 100644 --- a/dev-vcs/git/git-2.48.1.ebuild +++ b/dev-vcs/git/git-2.48.1.ebuild @@ -149,6 +149,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-parallel-build.patch ) pkg_setup() {