[packages/git-core] don't check test set consistency between make and meson; rel 2

atler atler at pld-linux.org
Sat Jan 11 19:20:53 CET 2025


commit 2f4449a4785cb5f408213044789c23441d46cfd5
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Jan 11 18:56:53 2025 +0100

    don't check test set consistency between make and meson; rel 2
    
    useful when adding/removing tests upstream but not during building
    downstream.
    
    could be fixed easier with `touch t/check-meson` but check-meson might
    be marked as .PHONY one day

 git-core.spec             |  4 +++-
 no-meson-test-check.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/git-core.spec b/git-core.spec
index 07eaecc..b63f91d 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,7 +14,7 @@ Summary:	Distributed version control system focused on speed, effectivity and us
 Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
 Version:	2.48.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
@@ -29,6 +29,7 @@ Source7:	gitolite.pl
 Patch0:		%{name}-key-bindings.patch
 Patch1:		%{name}-sysconfdir.patch
 Patch2:		cherry-picked-commitlog.patch
+Patch3:		no-meson-test-check.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -451,6 +452,7 @@ Dopełnianie parametrów komendy git dla powłoki zsh.
 %patch -P0 -p0
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 # we build things in contrib but want to have it clean for doc purporses, too
 cp -a contrib contrib-doc
diff --git a/no-meson-test-check.patch b/no-meson-test-check.patch
new file mode 100644
index 0000000..359f2b5
--- /dev/null
+++ b/no-meson-test-check.patch
@@ -0,0 +1,11 @@
+--- git-2.48.0/t/Makefile.orig	2025-01-10 18:43:46.000000000 +0100
++++ git-2.48.0/t/Makefile	2025-01-11 18:54:04.561948727 +0100
+@@ -59,7 +59,7 @@
+ 
+ all:: $(DEFAULT_TEST_TARGET)
+ 
+-test: pre-clean check-chainlint check-meson $(TEST_LINT)
++test: pre-clean check-chainlint $(TEST_LINT)
+ 	$(CHAINLINTSUPPRESS) $(MAKE) aggregate-results-and-cleanup
+ 
+ failed:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/2f4449a4785cb5f408213044789c23441d46cfd5



More information about the pld-cvs-commit mailing list