summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2025-01-08 03:43:59 +0000
committerSam James <sam@gentoo.org>2025-01-08 03:43:59 +0000
commit738f2b07de654a4e7d0eeaed0e679ab2e2ddc4ee (patch)
tree70deeaa91b4ed005a8ca74b3a8144b5c38cf3565 /dev-vcs
parentdev-vcs/git: add 2.48.0_rc2 (diff)
downloadgentoo-738f2b07de654a4e7d0eeaed0e679ab2e2ddc4ee.tar.gz
gentoo-738f2b07de654a4e7d0eeaed0e679ab2e2ddc4ee.tar.bz2
gentoo-738f2b07de654a4e7d0eeaed0e679ab2e2ddc4ee.zip
dev-vcs/git: add upstream ref for meson deps patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch17
1 files changed, 17 insertions, 0 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
index c28112663a3d..533a8b10803c 100644
--- 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
@@ -1,3 +1,17 @@
+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(
@@ -72,3 +86,6 @@
)
subdir('Git')
+--
+2.48.0.rc2.29.g7bab57bd98
+