All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	git@vger.kernel.org, Pete Wyckoff <pw@padd.com>
Subject: Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite
Date: Tue, 18 Nov 2014 10:43:47 -0800	[thread overview]
Message-ID: <20141118184347.GE6527@google.com> (raw)
In-Reply-To: <20141118183838.GD6527@google.com>

Jonathan Nieder wrote:
> Jeff King wrote:

>> Subject: Makefile: have perl scripts depend on NO_PERL setting
> [...]
>> ---
>>  Makefile | 3 +++
>>  1 file changed, 3 insertions(+)
>
> Gah.  Good catch.
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

... and here's a patch on top to give git-p4 the same treatment.

-- >8 --
Subject: Makefile: have python scripts depend on NO_PYTHON setting

Like the perl scripts, python scripts need a dependency to ensure they
are rebuilt when switching between the "dummy" versions that run
without Python and the real thing.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 8f980e0..7482a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1736,6 +1736,9 @@ $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
 	mv $@+ $@
 endif # NO_PERL
 
+# This makes sure we depend on the NO_PYTHON setting itself.
+$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+
 ifndef NO_PYTHON
 $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 $(SCRIPT_PYTHON_GEN): % : %.py
-- 
2.1.0.rc2.206.gedb03e5

  reply	other threads:[~2014-11-18 18:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-18 17:22 [PATCH] t0090: mark add-interactive test with PERL prerequisite Jeff King
2014-11-18 17:29 ` [PATCH] t960[34]: mark cvsimport tests as requiring perl Jeff King
2014-11-18 18:56   ` Jonathan Nieder
2014-11-18 19:15     ` Jeff King
2014-11-18 17:43 ` [PATCH] t0090: mark add-interactive test with PERL prerequisite Jeff King
2014-11-18 18:38   ` Jonathan Nieder
2014-11-18 18:43     ` Jonathan Nieder [this message]
2014-11-18 18:49       ` Jeff King
2014-11-18 23:10       ` Pete Wyckoff
2014-11-18 18:44     ` Jeff King
2014-11-18 18:51 ` Jonathan Nieder

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141118184347.GE6527@google.com \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    --cc=pw@padd.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.