[01/11] Makefile: clean perl/build/ even with NO_PERL=Y

Message ID	patch-01.11-185f5a9a9cf-20211217T002023Z-avarab@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Phillip Wood <phillip.wood123@gmail.com>, Jeff King <peff@peff.net>, Dan Jacques <dnj@google.com>, Eric Wong <e@80x24.org>, Jonathan Nieder <jrnieder@gmail.com>, Mike Hommey <mh@glandium.org>, =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= <congdanhqx@gmail.com>, Victoria Dye <vdye@github.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= <avarab@gmail.com> Subject: [PATCH 01/11] Makefile: clean perl/build/ even with NO_PERL=Y Date: Fri, 17 Dec 2021 01:26:17 +0100 Message-Id: <patch-01.11-185f5a9a9cf-20211217T002023Z-avarab@gmail.com> In-Reply-To: <cover-00.11-00000000000-20211217T002023Z-avarab@gmail.com> References: <cover-00.11-00000000000-20211217T002023Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Makefile: fix "Perl" and "Python" rules, speed up re-builds \| expand [00/11] Makefile: fix "Perl" and "Python" rules, speed up re-builds [01/11] Makefile: clean perl/build/ even with NO_PERL=Y [02/11] Makefile: don't set up "perl/build" rules under NO_PERL=Y [03/11] Makefile: use "=" not ":=" for po/* and perl/* [04/11] Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR [05/11] Makefile: guard Perl-only variable assignments [06/11] Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" [07/11] Makefile: adjust Perl-related comments & whitespace [08/11] Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph [09/11] Makefile: sort PERL_DEFINES list [10/11] Makefile: create a GIT-PYTHON-DEFINES, like "PERL" [11/11] Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts

Message ID

patch-01.11-185f5a9a9cf-20211217T002023Z-avarab@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 Phillip Wood <phillip.wood123@gmail.com>, Jeff King <peff@peff.net>,
 Dan Jacques <dnj@google.com>, Eric Wong <e@80x24.org>,
 Jonathan Nieder <jrnieder@gmail.com>, Mike Hommey <mh@glandium.org>,
	=?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?=  <congdanhqx@gmail.com>,
 Victoria Dye <vdye@github.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?=
	=?utf-8?b?b24=?=  <avarab@gmail.com>
Subject: [PATCH 01/11] Makefile: clean perl/build/ even with NO_PERL=Y
Date: Fri, 17 Dec 2021 01:26:17 +0100
Message-Id: <patch-01.11-185f5a9a9cf-20211217T002023Z-avarab@gmail.com>
In-Reply-To: <cover-00.11-00000000000-20211217T002023Z-avarab@gmail.com>
References: <cover-00.11-00000000000-20211217T002023Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Makefile: fix "Perl" and "Python" rules, speed up re-builds | expand

Commit Message

Ævar Arnfjörð Bjarmason Dec. 17, 2021, 12:26 a.m. UTC

Fix a regression in 499c29394ce (Makefile: allow building without
perl, 2009-04-03) where we'd stop cleaning the perl/* directory
because NO_PERL was defined, thus leaving behind litter if the flag at
"clean" time didn't match that of build time.

In 499c29394ce this was done to avoid relying on the perl/Makefile.PL,
but since my 20d2a30f8ff (Makefile: replace perl/Makefile.PL with
simple make rules, 2017-12-10) we can clean things in that directory
unconditionally.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9c00a793e47..b21ffe25c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -3280,6 +3280,7 @@  clean: profile-clean coverage-clean cocciclean
 	$(RM) $(HCC)
 	$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
 	$(RM) -r po/build/
+	$(RM) -r perl/build/
 	$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
 	$(RM) -r .dist-tmp-dir .doc-tmp-dir
 	$(RM) $(GIT_TARNAME).tar.gz
@@ -3288,7 +3289,6 @@  clean: profile-clean coverage-clean cocciclean
 	$(RM) Documentation/GIT-EXCLUDED-PROGRAMS
 ifndef NO_PERL
 	$(MAKE) -C gitweb clean
-	$(RM) -r perl/build/
 endif
 	$(MAKE) -C templates/ clean
 	$(MAKE) -C t/ clean

[01/11] Makefile: clean perl/build/ even with NO_PERL=Y

Commit Message

Patch