# [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD 5 messages from 2010-03-21 to 2010-03-21. Participants: R. Tyler Ballance, Junio C Hamano. Thread: https://gitlist.dev/t/23126 ## R. Tyler Ballance, 2010-03-21 19:01 Subject: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD Message-ID: <20100321190145.GA32578@kiwi.sharlinx.com> URL: https://gitlist.dev/e/20100321190145.GA32578%40kiwi.sharlinx.com ``` 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. --- Makefile | 6 +++++- contrib/fast-import/import-zips.py | 2 +- contrib/hg-to-git/hg-to-git.py | 2 +- contrib/p4import/git-p4import.py | 2 +- git_remote_helpers/Makefile | 6 +++++- 5 files changed, 13 insertions(+), 5 deletions(-) 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 export PERL_PATH diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 7051a83..82f5ed3 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python ## zip archive frontend for git-fast-import ## diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 854cd94..046cb2b 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/env python """ hg-to-git.py - A Mercurial to GIT converter diff --git a/contrib/p4import/git-p4import.py b/contrib/p4import/git-p4import.py index 0f3d97b..b6e534b 100644 --- a/contrib/p4import/git-p4import.py +++ b/contrib/p4import/git-p4import.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # This tool is copyright (c) 2006, Sean Estabrooks. # It is released under the Gnu Public License, version 2. diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile index c62dfd0..74b05dc 100644 --- a/git_remote_helpers/Makefile +++ b/git_remote_helpers/Makefile @@ -7,7 +7,11 @@ pysetupfile:=setup.py DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) 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 ifndef prefix prefix = $(HOME) -- 1.6.4.3 ``` ## Junio C Hamano, 2010-03-21 21:15 Subject: Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD Message-ID: <7veijdl6kp.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7veijdl6kp.fsf%40alter.siamese.dyndns.org In-Reply-To: <20100321190145.GA32578@kiwi.sharlinx.com> ``` "R. Tyler Ballance" 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? > 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? ``` ## R. Tyler Ballance, 2010-03-21 21:23 Subject: Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD Message-ID: <20100321212335.GB32016@kiwi.sharlinx.com> URL: https://gitlist.dev/e/20100321212335.GB32016%40kiwi.sharlinx.com In-Reply-To: <7veijdl6kp.fsf@alter.siamese.dyndns.org> ``` On Sun, 21 Mar 2010, Junio C Hamano wrote: > "R. Tyler Ballance" 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 ``` ## Junio C Hamano, 2010-03-21 22:13 Subject: Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD Message-ID: <7veijdfhmm.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7veijdfhmm.fsf%40alter.siamese.dyndns.org In-Reply-To: <20100321212335.GB32016@kiwi.sharlinx.com> ``` "R. Tyler Ballance" writes: >> I would have expected that the patch would look more like this: >> ... >> 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. Thanks. I usually use a "make" wrapper to handle platform particulars like setting PYTHON_PATH automatically outside of the build system we ship, and never noticed this. I'll just commit my version with a forged sign-off from you ;-) ``` ## R. Tyler Ballance, 2010-03-21 23:00 Subject: Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD Message-ID: <20100321230006.GC32016@kiwi.sharlinx.com> URL: https://gitlist.dev/e/20100321230006.GC32016%40kiwi.sharlinx.com In-Reply-To: <7veijdfhmm.fsf@alter.siamese.dyndns.org> ``` On Sun, 21 Mar 2010, Junio C Hamano wrote: > "R. Tyler Ballance" writes: > > >> I would have expected that the patch would look more like this: > >> ... > >> 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. > > Thanks. I usually use a "make" wrapper to handle platform particulars > like setting PYTHON_PATH automatically outside of the build system we > ship, and never noticed this. > > I'll just commit my version with a forged sign-off from you ;-) I find these terms acceptable :) Cheers, -R. Tyler Ballance -------------------------------------- Jabber: rtyler@jabber.org GitHub: http://github.com/rtyler Twitter: http://twitter.com/agentdero Blog: http://unethicalblogger.com ```