From: Todd Zullinger <tmz@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
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>
Subject: Re: [PATCH v5] Makefile: replace perl/Makefile.PL with simple make rules
Date: Wed, 20 Dec 2017 12:41:47 -0500 [thread overview]
Message-ID: <20171220174147.GG3693@zaya.teonanacatl.net> (raw)
In-Reply-To: <20171220115240.19510-1-avarab@gmail.com>
Ævar Arnfjörð Bjarmason wrote:
> [Sorry for not CC-ing you on the last version. Forgot to update the
> giant send-email line I'm juggling for this series].
No worries. It is a rather large CC list at this point. :)
> This *.pmc thing is just me being overly clever. Here's a v5 that gets
> rid of it. Diff with v4:
Ahh, thanks for the additional details on this.
> -+PMFILES := $(wildcard perl/*.pm perl/*/*.pm perl/*/*/*.pm perl/*/*/*/*.pm)
> -+PMCFILES := $(patsubst perl/%.pm,perl/build/lib/%.pmc,$(PMFILES))
> ++LIB_PERL := $(wildcard perl/*.pm perl/*/*.pm perl/*/*/*.pm perl/*/*/*/*.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' < $< > $@
> +
Without the .pmc extensions, rpm picks up the perl
dependencies, which is good. But an additional build/lib
dir is created, which ends up in $perllibdir after install.
Here's an extract from a local build:
mkdir -p perl/build/lib/build/lib/ && \
sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' < perl/build/lib/Git.pm > perl/build/lib/build/lib/Git.pm
mkdir -p perl/build/lib/build/lib/Git/ && \
sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' < perl/build/lib/Git/IndexInfo.pm > perl/build/lib/build/lib/Git/IndexInfo.pm
mkdir -p perl/build/lib/build/lib/Git/ && \
sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' < perl/build/lib/Git/SVN.pm > perl/build/lib/build/lib/Git/SVN.pm
mkdir -p perl/build/lib/build/lib/Git/ && \
sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' < perl/build/lib/Git/Error.pm > perl/build/lib/build/lib/Git/Error.pm
mkdir -p perl/build/lib/build/lib/Git/ && \
sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' < perl/build/lib/Git/I18N.pm > perl/build/lib/build/lib/Git/I18N.pm
When PMFILES and PMCFILES matched .pm and .pmc respectively,
the glob didn't match duplicated files under build/lib, so
this wasn't an issue. I'm not sure where this is best
fixed. The build/lib dir could be moved outside of perl or
it could be made .build/lib to avoid the wildcard match,
perhaps.
Building with perllibdir=/usr/share/perl5/vendor_perl
results in:
/usr/share/perl5/vendor_perl/Git
/usr/share/perl5/vendor_perl/Git.pm
/usr/share/perl5/vendor_perl/Git/Error.pm
/usr/share/perl5/vendor_perl/Git/FromCPAN
/usr/share/perl5/vendor_perl/Git/FromCPAN/Error.pm
/usr/share/perl5/vendor_perl/Git/I18N.pm
/usr/share/perl5/vendor_perl/Git/IndexInfo.pm
/usr/share/perl5/vendor_perl/Git/SVN
/usr/share/perl5/vendor_perl/Git/SVN.pm
/usr/share/perl5/vendor_perl/Git/SVN/Editor.pm
/usr/share/perl5/vendor_perl/Git/SVN/Fetcher.pm
/usr/share/perl5/vendor_perl/Git/SVN/GlobSpec.pm
/usr/share/perl5/vendor_perl/Git/SVN/Log.pm
/usr/share/perl5/vendor_perl/Git/SVN/Memoize
/usr/share/perl5/vendor_perl/Git/SVN/Memoize/YAML.pm
/usr/share/perl5/vendor_perl/Git/SVN/Migration.pm
/usr/share/perl5/vendor_perl/Git/SVN/Prompt.pm
/usr/share/perl5/vendor_perl/Git/SVN/Ra.pm
/usr/share/perl5/vendor_perl/Git/SVN/Utils.pm
/usr/share/perl5/vendor_perl/build
/usr/share/perl5/vendor_perl/build/lib
/usr/share/perl5/vendor_perl/build/lib/Git
/usr/share/perl5/vendor_perl/build/lib/Git.pm
/usr/share/perl5/vendor_perl/build/lib/Git/Error.pm
/usr/share/perl5/vendor_perl/build/lib/Git/I18N.pm
/usr/share/perl5/vendor_perl/build/lib/Git/IndexInfo.pm
/usr/share/perl5/vendor_perl/build/lib/Git/SVN.pm
Note that not all of the .pm files are matched, which I
believe is due to the glob matches only going 4 levels deep
under the perl dir.
Thanks,
--
Todd
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Never do today that which will become someone else's responsibility
tomorrow.
next prev parent reply other threads:[~2017-12-20 17:41 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 [this message]
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
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=20171220174147.GG3693@zaya.teonanacatl.net \
--to=tmz@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=gitster@pobox.com \
--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 \
/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).