git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "R. Tyler Ballance" <tyler@monkeypox.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD
Date: Sun, 21 Mar 2010 14:23:35 -0700	[thread overview]
Message-ID: <20100321212335.GB32016@kiwi.sharlinx.com> (raw)
In-Reply-To: <7veijdl6kp.fsf@alter.siamese.dyndns.org>

[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]


On Sun, 21 Mar 2010, Junio C Hamano wrote:

> "R. Tyler Ballance" <tyler@monkeypox.org> writes:
> 
> > On FreeBSD, Python does not ship as part of the base system but is available
> > via the ports system, which install the binary in /usr/local/bin.
> > ---
> 
> Sign-off?

Sorry, I was under the impression somebody who knew what the hell they were
doing would be the one adding a Sign-off By to the commit :)


> 
> > diff --git a/Makefile b/Makefile
> > index 3a6c6ea..4f8fbf0 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -444,7 +444,11 @@ ifndef PERL_PATH
> >  	PERL_PATH = /usr/bin/perl
> >  endif
> >  ifndef PYTHON_PATH
> > -	PYTHON_PATH = /usr/bin/python
> > +	ifeq ($(uname_S),FreeBSD)
> > +		PYTHON_PATH = /usr/local/bin/python
> > +	else
> > +		PYTHON_PATH = /usr/bin/python
> > +	endif
> >  endif
> 
> I would have expected that the patch would look more like this:
> 
> diff --git a/Makefile b/Makefile
> index 98372eb..5bb0769 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -831,6 +831,7 @@ ifeq ($(uname_S),FreeBSD)
>  		NO_UINTMAX_T = YesPlease
>  		NO_STRTOUMAX = YesPlease
>  	endif
> +	PYTHON_PATH = /usr/local/bin/python
>  endif
>  ifeq ($(uname_S),OpenBSD)
>  	NO_STRCASESTR = YesPlease
> 
> What am I missing?

No, that looks right, I didn't notice the specialized section towards the
bottom for FreeBSD or the others for that matter.

Third time's the charm

Cheers,
-R. Tyler Ballance
--------------------------------------
 Jabber: rtyler@jabber.org
 GitHub: http://github.com/rtyler
Twitter: http://twitter.com/agentdero
   Blog: http://unethicalblogger.com


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

  reply	other threads:[~2010-03-21 21:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-21 19:01 [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD R. Tyler Ballance
2010-03-21 21:15 ` Junio C Hamano
2010-03-21 21:23   ` R. Tyler Ballance [this message]
2010-03-21 22:13     ` Junio C Hamano
2010-03-21 23:00       ` R. Tyler Ballance

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=20100321212335.GB32016@kiwi.sharlinx.com \
    --to=tyler@monkeypox.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@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.
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 NNTP newsgroup(s).