[PATCH v2] osx: explicitly build hg with /usr/bin/python2.7

[Kevin Bullock]

> On Jul 13, 2016, at 13:17, Augie Fackler <raf at durin42.com> wrote:
> 
>> On Jul 13, 2016, at 14:14, Kevin Bullock <kbullock+mercurial at ringworld.org> wrote:
>> 
>>> On Jul 13, 2016, at 11:41, Augie Fackler <raf at durin42.com> wrote:
>>> 
>>> # HG changeset patch
>>> # User Augie Fackler <augie at google.com>
>>> # Date 1468420773 14400
>>> #      Wed Jul 13 10:39:33 2016 -0400
>>> # Node ID 0093ec77d1ec1a34dd34cf2cf47c06e1cbce246a
>>> # Parent  90c0b1d4d7c835c122552a4a52978b5fdd0cf9eb
>>> osx: explicitly build hg with /usr/bin/python2.7
>>> 
>>> This should help avoid creating a package that depends on a custom
>>> Python, as happened when I built a package for 3.8.
>>> 
>>> diff --git a/Makefile b/Makefile
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -156,7 +156,7 @@ i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n
>>> # Packaging targets
>>> 
>>> osx:
>>> -	python setup.py install --optimize=1 \
>>> +	/usr/bin/python2.7 setup.py install --optimize=1 \
>>> 	  --root=build/mercurial/ --prefix=/usr/local/ \
>>> 	  --install-lib=/Library/Python/2.7/site-packages/
>>> 	make -C doc all install DESTDIR="$(PWD)/build/mercurial/"
>>> diff --git a/tests/test-mac-packages.t b/tests/test-mac-packages.t
>>> --- a/tests/test-mac-packages.t
>>> +++ b/tests/test-mac-packages.t
>>> @@ -43,5 +43,11 @@ Spot-check some randomly selected files:
>>> $ grep '/hg	' boms.txt | cut -d '	' -f 1,2,3
>>> ./usr/local/bin/hg	100755	0/0
>>> 
>>> +Make sure the built binary uses the system Python interpreter
>>> +  $ tar xf mercurial.pkg/Payload usr/local/bin
>> 
>> This fails for me:
>> 
>> [...]
>> I'm on Yosemite. Is this different on El Capitan?
> 
> No, it's the same format. What is tar --version on Yosemite? I've got bsdtar 2.8.3 here.

Discovered (via IRC conversation) that my GNU tar is causing the failure. Fixed in-flight to use bsdtar explicitly and pushed. Thanks!

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock