[v2,06/18] Makefile: guard Perl-only variable assignments

Message ID	patch-v2-06.18-eea89794493-20211112T214150Z-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>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH v2 06/18] Makefile: guard Perl-only variable assignments Date: Fri, 12 Nov 2021 22:48:50 +0100 Message-Id: <patch-v2-06.18-eea89794493-20211112T214150Z-avarab@gmail.com> In-Reply-To: <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com> References: <cover-00.16-00000000000-20211106T205717Z-avarab@gmail.com> <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Makefiles: dependency correctness & speedup \| expand [v2,00/18] Makefiles: dependency correctness & speedup [v2,01/18] Makefile: don't invoke msgfmt with --statistics [v2,02/18] Makefile: don't set up "perl/build" rules under NO_PERL=Y [v2,03/18] Makefile: use "=" not ":=" for po/* and perl/* [v2,04/18] Makefile: clean perl/build/ even with NO_PERL=Y [v2,05/18] Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR [v2,06/18] Makefile: guard Perl-only variable assignments [v2,07/18] Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" [v2,08/18] Makefile: adjust Perl-related comments & whitespace [v2,09/18] Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph [v2,10/18] Makefile: create a GIT-PYTHON-DEFINES, like "PERL" [v2,11/18] Makefile: stop needing @@GIT_VERSION@@ in .perl scripts [v2,12/18] Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it [v2,13/18] Makefile: move $(comma), $(empty) and $(space) to shared.mak [v2,14/18] Makefile: re-add and use the "shellquote" macros [v2,15/18] Makefile: add a "TRACK_template" for GIT-{FLAGS,DEFINES,...} [v2,16/18] Makefile: add "$(QUIET)" boilerplate to shared.mak [v2,17/18] Makefile: use $(wspfx) for $(QUIET...) in shared.mak [v2,18/18] Makefiles: add and use wildcard "mkdir -p" template

Message ID

patch-v2-06.18-eea89794493-20211112T214150Z-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>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?=
	=?utf-8?b?amFybWFzb24=?=  <avarab@gmail.com>
Subject: [PATCH v2 06/18] Makefile: guard Perl-only variable assignments
Date: Fri, 12 Nov 2021 22:48:50 +0100
Message-Id: <patch-v2-06.18-eea89794493-20211112T214150Z-avarab@gmail.com>
In-Reply-To: <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com>
References: <cover-00.16-00000000000-20211106T205717Z-avarab@gmail.com>
 <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Makefiles: dependency correctness & speedup | expand

Commit Message

Ævar Arnfjörð Bjarmason Nov. 12, 2021, 9:48 p.m. UTC

Move the "ifndef NO_PERL" a few lines earlier to encompass the
"perl_localedir_SQ" variable. We'll only use it under !NO_PERL.

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 284725099c9..0cb10f00ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -2291,11 +2291,11 @@  git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
 # This makes sure we depend on the NO_PERL setting itself.
 $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
 
+ifndef NO_PERL
 # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX
 # since the locale directory is injected.
 perl_localedir_SQ = $(localedir_SQ)
 
-ifndef NO_PERL
 PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
 PERL_DEFINES =
 PERL_DEFINES += $(PERL_PATH_SQ)

[v2,06/18] Makefile: guard Perl-only variable assignments

Commit Message

Patch