From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Dan Jacques <dnj@google.com>,
Alex Riesen <alexander.riesen@cetitec.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Brandon Casey <drafnel@gmail.com>, Petr Baudis <pasky@ucw.cz>,
Gerrit Pape <pape@smarden.org>,
"martin f . krafft" <madduck@madduck.net>,
Eric Wong <e@80x24.org>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
"Randall S . Becker" <rsbecker@nexbridge.com>,
Michael J Gruber <git@grubix.eu>, Todd Zullinger <tmz@pobox.com>
Subject: Re: [PATCH v6] Makefile: replace perl/Makefile.PL with simple make rules
Date: Fri, 22 Dec 2017 11:07:21 -0800 [thread overview]
Message-ID: <xmqqefnmshsm.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171220182419.16865-1-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Wed, 20 Dec 2017 18:24:19 +0000")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
Thanks, but I thought the patch was already in 'next' for a week or
more and it's time to refine incrementally.
Here is the difference as I see between what we already have and
this update, and a proposed summary.
-- >8 --
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Subject: perl: avoid *.pmc and fix Error.pm further
The previous round tried to use *.pmc files but it confused RPM
dependency analysis on some distros. Install them as plain
vanilla *.pm files instead.
Also "local @_" construct did not properly work when goto &sub
is used until recent versions of Perl. Avoid it (and we do not
need to localize it here anyway).
---
diff --git a/Makefile b/Makefile
index ba6607b7e7..5c73cd208a 100644
--- a/Makefile
+++ b/Makefile
@@ -2274,14 +2274,14 @@ endif
po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
$(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
-PMFILES := $(wildcard perl/*.pm perl/*/*.pm perl/*/*/*.pm perl/*/*/*/*.pm)
-PMCFILES := $(patsubst perl/%.pm,perl/build/lib/%.pmc,$(PMFILES))
+LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm)
+LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL))
ifndef NO_PERL
-all:: $(PMCFILES)
+all:: $(LIB_PERL_GEN)
endif
-perl/build/lib/%.pmc: perl/%.pm
+perl/build/lib/%.pm: perl/%.pm
$(QUIET_GEN)mkdir -p $(dir $@) && \
sed -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' < $< > $@
diff --git a/perl/Git/Error.pm b/perl/Git/Error.pm
index 5874672150..09bbc97390 100644
--- a/perl/Git/Error.pm
+++ b/perl/Git/Error.pm
@@ -39,7 +39,7 @@ sub import {
require Error;
};
- local @_ = ($caller, @_);
+ unshift @_, $caller;
goto &Error::import;
}
next prev parent reply other threads:[~2017-12-22 19:07 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 15:34 [RFC/PATCH] Makefile: replace the overly complex perl build system with something simple Ævar Arnfjörð Bjarmason
2017-11-29 19:54 ` [PATCH] Makefile: replace perl/Makefile.PL with simple make rules Ævar Arnfjörð Bjarmason
2017-11-30 2:11 ` Jonathan Nieder
2017-11-30 9:37 ` Ævar Arnfjörð Bjarmason
2017-11-30 20:59 ` Jonathan Nieder
2017-11-30 21:16 ` Eric Wong
2017-11-30 21:31 ` Jeff King
2017-11-30 22:30 ` Ævar Arnfjörð Bjarmason
2017-12-21 19:29 ` Alex Vandiver
2017-12-03 11:59 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2017-12-04 16:22 ` Junio C Hamano
2017-12-04 18:08 ` Ævar Arnfjörð Bjarmason
2017-12-04 19:42 ` Junio C Hamano
2017-12-04 19:51 ` Dan Jacques
2017-12-10 21:13 ` [PATCH v3] " Ævar Arnfjörð Bjarmason
2017-12-11 23:29 ` Junio C Hamano
2017-12-12 21:33 ` Randall S. Becker
2017-12-12 22:26 ` Ævar Arnfjörð Bjarmason
2017-12-15 10:35 ` Michael J Gruber
2017-12-15 15:09 ` Todd Zullinger
2017-12-15 17:31 ` Ævar Arnfjörð Bjarmason
2017-12-19 15:53 ` Junio C Hamano
2017-12-19 23:57 ` [PATCH v4] " Ævar Arnfjörð Bjarmason
2017-12-20 6:15 ` Todd Zullinger
2017-12-20 11:52 ` [PATCH v5] " Ævar Arnfjörð Bjarmason
2017-12-20 17:41 ` Todd Zullinger
2017-12-20 18:24 ` [PATCH v6] " Ævar Arnfjörð Bjarmason
2017-12-20 20:17 ` Todd Zullinger
2017-12-21 7:22 ` Alex Riesen
2017-12-22 19:07 ` Junio C Hamano [this message]
2017-12-27 22:24 ` Ævar Arnfjörð Bjarmason
2017-12-28 18:36 ` Junio C Hamano
2018-01-02 19:17 ` Jonathan Nieder
2018-01-02 20:01 ` [PATCH ab/simplify-perl-makefile] perl: treat PERLLIB_EXTRA as an extra path again (Re: [PATCH v6] Makefile: replace perl/Makefile.PL with simple make rules) Jonathan Nieder
2018-01-02 20:39 ` Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqefnmshsm.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=alexander.riesen@cetitec.com \
--cc=avarab@gmail.com \
--cc=dnj@google.com \
--cc=drafnel@gmail.com \
--cc=e@80x24.org \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=madduck@madduck.net \
--cc=pape@smarden.org \
--cc=pasky@ucw.cz \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=rsbecker@nexbridge.com \
--cc=tmz@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).