commit: 32651200e51f48cbaa457776b3820679e08a6252 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Jan 15 18:51:42 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> 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....@gentoo.org/ - -From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001 -Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git....@gentoo.org> -From: Sam James <[email protected]> -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 <[email protected]> ---- 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 -
