From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 9855F1581F0 for ; Sat, 18 Jan 2025 23:49:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE13AE08EC; Sat, 18 Jan 2025 23:49:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id B611FE08DA for ; Sat, 18 Jan 2025 23:49:11 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42E44342FA0 for ; Sat, 18 Jan 2025 23:49:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D38BB2082 for ; Sat, 18 Jan 2025 23:49:08 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1737244137.32651200e51f48cbaa457776b3820679e08a6252.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch X-VCS-Directories: dev-vcs/git/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 32651200e51f48cbaa457776b3820679e08a6252 X-VCS-Branch: master Date: Sat, 18 Jan 2025 23:49:08 +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: 1b637274-154c-4785-a034-6f4f46ad9a81 X-Archives-Hash: bd5cab59020e308da2a80c17cf877057 commit: 32651200e51f48cbaa457776b3820679e08a6252 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jan 15 18:51:42 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jan 18 23:48:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32651200 dev-vcs/git: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch | 91 ----------------------- 1 file changed, 91 deletions(-) diff --git a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch b/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch deleted file mode 100644 index 533a8b10803c..000000000000 --- a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch +++ /dev/null @@ -1,91 +0,0 @@ -https://lore.kernel.org/git/371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org/ - -From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001 -Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git.sam@gentoo.org> -From: Sam James -Date: Wed, 8 Jan 2025 03:40:55 +0000 -Subject: [PATCH] meson: fix perl dependencies - -`generate_perl_command` needs `depends: [git_version_file]` and the uses -in top-level meson.build were fine, but the ones in perl/ weren't, causing -parallel build failures in some cases as GIT-BUILD-OPTIONS wasn't yet -available. - -Signed-off-by: Sam James ---- a/perl/FromCPAN/Mail/meson.build -+++ b/perl/FromCPAN/Mail/meson.build -@@ -4,4 +4,5 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail', -+ depends: [git_version_file], - ) ---- a/perl/FromCPAN/meson.build -+++ b/perl/FromCPAN/meson.build -@@ -4,6 +4,7 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/FromCPAN', -+ depends: [git_version_file], - ) - - subdir('Mail') ---- a/perl/Git/LoadCPAN/Mail/meson.build -+++ b/perl/Git/LoadCPAN/Mail/meson.build -@@ -4,4 +4,5 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail', -+ depends: [git_version_file], - ) ---- a/perl/Git/LoadCPAN/meson.build -+++ b/perl/Git/LoadCPAN/meson.build -@@ -4,6 +4,7 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN', -+ depends: [git_version_file], - ) - - subdir('Mail') ---- a/perl/Git/SVN/Memoize/meson.build -+++ b/perl/Git/SVN/Memoize/meson.build -@@ -4,4 +4,5 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/Git/SVN', -+ depends: [git_version_file], - ) ---- a/perl/Git/SVN/meson.build -+++ b/perl/Git/SVN/meson.build -@@ -14,6 +14,7 @@ foreach source : [ - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/Git/SVN', -+ depends: [git_version_file], - ) - endforeach - ---- a/perl/Git/meson.build -+++ b/perl/Git/meson.build -@@ -11,6 +11,7 @@ foreach source : [ - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5/Git', -+ depends: [git_version_file], - ) - endforeach - ---- a/perl/meson.build -+++ b/perl/meson.build -@@ -4,6 +4,7 @@ test_dependencies += custom_target( - command: generate_perl_command, - install: true, - install_dir: get_option('datadir') / 'perl5', -+ depends: [git_version_file], - ) - - subdir('Git') --- -2.48.0.rc2.29.g7bab57bd98 -