git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.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>,
	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>,
	Brandon Williams <bmwill@google.com>
Subject: Re: [PATCH v6] Makefile: replace perl/Makefile.PL with simple make rules
Date: Tue, 2 Jan 2018 11:17:20 -0800	[thread overview]
Message-ID: <20180102191720.GB131371@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <20171220182419.16865-1-avarab@gmail.com>

Hi,

Ævar Arnfjörð Bjarmason wrote:

> +++ b/Makefile
[...]
> -PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
> -$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
> +PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
> +$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE
>  	$(QUIET_GEN)$(RM) $@ $@+ && \
> -	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
>  	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
>  	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
>  	sed -e '1{' \
>  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
>  	    -e '	h' \
> -	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'"));=' \
> +	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'" || "'"$(perllibdir_SQ)"'"));=' \

This appears to have broken a build with INSTLIBDIR set.

 $ head -2 /usr/local/git/current/libexec/git-core/git-add--interactive
 #!/usr/bin/perl
 use lib (split(/:/, $ENV{GITPERLLIB} || ":/Applications/Xcode.app/Contents/Developer/Library/Perl/5.@{[sub{use Config; $Config{api_version}}->()]}/darwin-thread-multi-2level" || "/usr/local/git/current/share/perl5"));

(forgive the hackiness there).

Is there a reason we don't do

	INSTLIBDIR='$(perllibdir_SQ)' && \
	INSTLIBDIR_EXTRA=... &&
	INSTLIBDIR=...

and

	use lib ... || "'"$$INSTLIBDIR"'"));=' \

?

Thanks,
Jonathan

  parent reply	other threads:[~2018-01-02 19:17 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
2017-12-27 22:24                           ` Ævar Arnfjörð Bjarmason
2017-12-28 18:36                             ` Junio C Hamano
2018-01-02 19:17                         ` Jonathan Nieder [this message]
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=20180102191720.GB131371@aiede.mtv.corp.google.com \
    --to=jrnieder@gmail.com \
    --cc=alexander.riesen@cetitec.com \
    --cc=avarab@gmail.com \
    --cc=bmwill@google.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=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).