From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/6] Makefile/perl: correctly re-generate build/* + speed up under NO_GETTEXT=Y
Date: Mon, 10 May 2021 12:50:16 +0200 [thread overview]
Message-ID: <cover-0.6-00000000000-20210510T104937Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.4-00000000000-20210505T121857Z-avarab@gmail.com>
The summary, from v1:
These patches are relatively trivial fixes for bugs noticed when I was
working on recent send-email patches. We don't re-build perl/build/*
assets when variables that affect them are changed, and needlessly use
our non-mock gettext Perl i18n framework under NO_GETTEXT=Y if the
system happens to have Locale::Messages installed.
Changes since v1:
The only change to the end-state is the trivial change-on-top of:
-PERL_DEFINES :=
+PERL_DEFINES =
I.e. the PERL_DEFINES is now also refactored away from a
simply-expanded variable. The re-arrangement and split-up of patches
in this v2 just makes for a more incremental way to get there, per the
discussion on v1.
Ævar Arnfjörð Bjarmason (6):
Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes
Makefile: don't re-define PERL_DEFINES
Makefile: make PERL_DEFINES recursively expanded
Makefile: split up the deceleration of PERL_DEFINES
Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS change
perl: use mock i18n functions under NO_GETTEXT=Y
Makefile | 13 +++++++++----
perl/Git/I18N.pm | 10 ++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
Range-diff against v1:
2: 49339028db4 = 1: 8b899364916 Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes
-: ----------- > 2: c15887bbc93 Makefile: don't re-define PERL_DEFINES
-: ----------- > 3: 7919ae0e546 Makefile: make PERL_DEFINES recursively expanded
1: ed2005a2fbf ! 4: 2cdefbe920c Makefile: don't re-define PERL_DEFINES
@@ Metadata
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
## Commit message ##
- Makefile: don't re-define PERL_DEFINES
+ Makefile: split up the deceleration of PERL_DEFINES
- Since 07d90eadb50 (Makefile: add Perl runtime prefix support,
- 2018-04-10) we have been declaring PERL_DEFINES right after assigning
- to it, with the effect that the first PERL_DEFINES was ignored.
+ Split the declaration of PERL_DEFINES across multiple line, making
+ this easier to read.
- That bug didn't matter in practice since the first line had all the
- same variables as the second, so we'd correctly re-generate
- everything. It just made for confusing reading.
-
- Let's remove that first assignment, and while we're at it split these
- across lines to make them more maintainable.
+ In 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10)
+ when PERL_DEFINES was added only the RUNTIME_PREFIX was put on its own
+ line the rest weren't formatted like that for consistency. Let's do
+ that to make this consistent with most of the rest of this Makefile.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ Makefile: perl_localedir_SQ = $(localedir_SQ)
ifndef NO_PERL
PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
--PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
--
--PERL_DEFINES := $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ)
-+PERL_DEFINES :=
+-PERL_DEFINES = $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ)
++PERL_DEFINES =
+PERL_DEFINES += $(PERL_PATH_SQ)
+PERL_DEFINES += $(PERLLIB_EXTRA_SQ)
+PERL_DEFINES += $(perllibdir_SQ)
3: 06e25bc1db3 = 5: 1171b73256e Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS change
4: 97247cb72a5 = 6: 7a5e7cf39a5 perl: use mock i18n functions under NO_GETTEXT=Y
--
2.31.1.838.g924d365b763
next prev parent reply other threads:[~2021-05-10 11:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 12:21 [PATCH 0/4] Makefile/perl: correctly re-generate build/* + speed up under NO_GETTEXT=Y Ævar Arnfjörð Bjarmason
2021-05-05 12:21 ` [PATCH 1/4] Makefile: don't re-define PERL_DEFINES Ævar Arnfjörð Bjarmason
2021-05-05 14:08 ` Jeff King
2021-05-06 1:05 ` Junio C Hamano
2021-05-06 16:55 ` Jeff King
2021-05-06 6:23 ` Ævar Arnfjörð Bjarmason
2021-05-06 8:42 ` Junio C Hamano
2021-05-06 9:04 ` Ævar Arnfjörð Bjarmason
2021-05-06 16:59 ` Jeff King
2021-05-07 8:42 ` Junio C Hamano
2021-05-05 12:21 ` [PATCH 2/4] Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes Ævar Arnfjörð Bjarmason
2021-05-05 12:21 ` [PATCH 3/4] Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS change Ævar Arnfjörð Bjarmason
2021-05-05 12:21 ` [PATCH 4/4] perl: use mock i18n functions under NO_GETTEXT=Y Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` Ævar Arnfjörð Bjarmason [this message]
2021-05-10 10:50 ` [PATCH v2 1/6] Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` [PATCH v2 2/6] Makefile: don't re-define PERL_DEFINES Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` [PATCH v2 3/6] Makefile: make PERL_DEFINES recursively expanded Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` [PATCH v2 4/6] Makefile: split up the deceleration of PERL_DEFINES Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` [PATCH v2 5/6] Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS change Ævar Arnfjörð Bjarmason
2021-05-10 10:50 ` [PATCH v2 6/6] perl: use mock i18n functions under NO_GETTEXT=Y Ævar Arnfjörð Bjarmason
2021-05-10 18:17 ` [PATCH v2 0/6] Makefile/perl: correctly re-generate build/* + speed up " Junio C Hamano
2021-05-11 6:56 ` Ævar Arnfjörð Bjarmason
2021-05-11 7:05 ` Junio C Hamano
2021-05-12 9:49 ` [PATCH] Makefile: make PERL_DEFINES recursively expanded Ævar Arnfjörð Bjarmason
2021-05-12 19:53 ` Jeff King
2021-05-12 22:45 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover-0.6-00000000000-20210510T104937Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).