From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/
Date: Sat, 18 Jan 2025 23:49:08 +0000 (UTC) [thread overview]
Message-ID: <1737244137.32651200e51f48cbaa457776b3820679e08a6252.conikost@gentoo> (raw)
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.sam@gentoo.org/
-
-From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001
-Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-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 <sam@gentoo.org>
---- 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
-
next reply other threads:[~2025-01-18 23:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-18 23:49 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-11 6:40 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/ Sam James
2025-01-10 21:45 Ionen Wolkens
2025-01-08 3:45 Sam James
2024-10-13 13:43 Conrad Kostecki
2023-03-16 16:39 Robin H. Johnson
2021-12-06 9:38 Lars Wendler
2021-09-01 23:43 Sam James
2019-03-11 4:48 Aaron Bauman
2017-11-17 17:20 Robin H. Johnson
2016-05-08 22:57 Mike Gilbert
2016-05-08 20:00 Mike Gilbert
2016-05-03 9:47 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1737244137.32651200e51f48cbaa457776b3820679e08a6252.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox