[v3,06/23] Makefile: guard Perl-only variable assignments

Message ID	patch-v3-06.23-98e14c7eba9-20211116T114334Z-avarab@gmail.com (mailing list archive)
State	Superseded
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?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH v3 06/23] Makefile: guard Perl-only variable assignments Date: Tue, 16 Nov 2021 13:00:06 +0100 Message-Id: <patch-v3-06.23-98e14c7eba9-20211116T114334Z-avarab@gmail.com> In-Reply-To: <cover-v3-00.23-00000000000-20211116T114334Z-avarab@gmail.com> References: <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com> <cover-v3-00.23-00000000000-20211116T114334Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Makefile: dependency fixes, make noop runtime ~1.4x faster \| expand [v3,00/23] Makefile: dependency fixes, make noop runtime ~1.4x faster [v3,01/23] Makefile: don't invoke msgfmt with --statistics [v3,02/23] Makefile: don't set up "perl/build" rules under NO_PERL=Y [v3,03/23] Makefile: use "=" not ":=" for po/* and perl/* [v3,04/23] Makefile: clean perl/build/ even with NO_PERL=Y [v3,05/23] Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR [v3,06/23] Makefile: guard Perl-only variable assignments [v3,07/23] Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" [v3,08/23] Makefile: adjust Perl-related comments & whitespace [v3,09/23] Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph [v3,10/23] Makefile: create a GIT-PYTHON-DEFINES, like "PERL" [v3,11/23] Makefile: stop needing @@GIT_VERSION@@ in .perl scripts [v3,12/23] Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it [v3,13/23] Makefile: move $(comma), $(empty) and $(space) to shared.mak [v3,14/23] Makefile: re-add and use the "shellquote" macros [v3,15/23] Makefile: add a "TRACK_template" for GIT-{FLAGS,DEFINES,...} [v3,16/23] Makefile: add "$(QUIET)" boilerplate to shared.mak [v3,17/23] Makefile: use $(wspfx) for $(QUIET...) in shared.mak [v3,18/23] Makefiles: add and use wildcard "mkdir -p" template [v3,19/23] Makefile: correct the dependency graph of hook-list.h [v3,20/23] Makefile: use $(file) I/O instead of "FORCE" when possible [v3,21/23] Makefile: disable GNU make built-in wildcard rules [v3,22/23] Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES) [v3,23/23] Makefile: move ".SUFFIXES" rule to shared.mak

Message ID

patch-v3-06.23-98e14c7eba9-20211116T114334Z-avarab@gmail.com (mailing list archive)

State

Superseded

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?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
Subject: [PATCH v3 06/23] Makefile: guard Perl-only variable assignments
Date: Tue, 16 Nov 2021 13:00:06 +0100
Message-Id: <patch-v3-06.23-98e14c7eba9-20211116T114334Z-avarab@gmail.com>
In-Reply-To: <cover-v3-00.23-00000000000-20211116T114334Z-avarab@gmail.com>
References: <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com>
 <cover-v3-00.23-00000000000-20211116T114334Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Makefile: dependency fixes, make noop runtime ~1.4x faster | expand

Commit Message

Ævar Arnfjörð Bjarmason Nov. 16, 2021, noon 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)

[v3,06/23] Makefile: guard Perl-only variable assignments

Commit Message

Patch