diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-12-22 11:07:21 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-28 10:35:21 -0800 |
| commit | 805a378649d69aa1503fd2a22afc5490c6e9c2d3 (patch) | |
| tree | 65203302bb6907139c079a0b7765e24d77ada1a0 | |
| parent | Makefile: replace perl/Makefile.PL with simple make rules (diff) | |
| download | tgif-805a378649d69aa1503fd2a22afc5490c6e9c2d3.tar.xz | |
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).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | perl/Git/Error.pm | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -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; } |