Re: [PATCH v2 0/6] Makefile/perl: correctly re-generate build/* + speed up under NO_GETTEXT=Y

3 messages, 3 authors, 2021-05-12 · open the first message on its own page

Re: [PATCH v2 0/6] Makefile/perl: correctly re-generate build/* + speed up under NO_GETTEXT=Y

From: Junio C Hamano <hidden>
Date: 2021-05-11 07:06:00

Ævar Arnfjörð Bjarmason [off-list ref] writes:
On Tue, May 11 2021, Junio C Hamano wrote:
quoted
Ævar Arnfjörð Bjarmason  [off-list ref] writes:
quoted
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:
Hmph, didn't reviewers declare that the previous round good enough?
I thought I merged it 'next' already.
I sent this re-roll before I noticed that. Nevermind & sorry for the
noise.
Mails cross all the time.  A single-liner follow-up incremental
would be good, perhaps?

Thanks.

[PATCH] Makefile: make PERL_DEFINES recursively expanded

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-05-12 09:49:59

Since 07d90eadb50 (Makefile: add Perl runtime prefix support,
2018-04-10) PERL_DEFINES has been a simply-expanded variable, let's
make it recursively expanded instead.

This change doesn't matter for the correctness of the logic. Whether
we used simply-expanded or recursively expanded didn't change what we
wrote out in GIT-PERL-DEFINES, but being consistent with other rules
makes this easier to understand.

Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---

This is a trivial improvement-on-top for my ab/perl-makefile-cleanup
already in "next". I'd sent a v2 of that in [1] not seeing it was
merged down already, this incremental patch replaces that and results
in the same end-state.

1. https://lore.kernel.org/git/cover-0.6-00000000000-20210510T104937Z-avarab@gmail.com/

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b8d6b31305..0705fc2d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -2271,7 +2271,7 @@ perl_localedir_SQ = $(localedir_SQ)
 
 ifndef NO_PERL
 PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
-PERL_DEFINES :=
+PERL_DEFINES =
 PERL_DEFINES += $(PERL_PATH_SQ)
 PERL_DEFINES += $(PERLLIB_EXTRA_SQ)
 PERL_DEFINES += $(perllibdir_SQ)
-- 
2.31.1.909.g789bb6d90e

Re: [PATCH] Makefile: make PERL_DEFINES recursively expanded

From: Jeff King <hidden>
Date: 2021-05-12 20:37:31

On Wed, May 12, 2021 at 11:49:44AM +0200, Ævar Arnfjörð Bjarmason wrote:
Since 07d90eadb50 (Makefile: add Perl runtime prefix support,
2018-04-10) PERL_DEFINES has been a simply-expanded variable, let's
make it recursively expanded instead.

This change doesn't matter for the correctness of the logic. Whether
we used simply-expanded or recursively expanded didn't change what we
wrote out in GIT-PERL-DEFINES, but being consistent with other rules
makes this easier to understand.
Thanks for following up on this. I think it's worth doing.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help