# HG changeset patch # User Augie Fackler # Date 1468420773 14400 # Node ID da1848f07c6ac14a748e5dea826342922f686480 # Parent 7794e13c6a7e308caf9acacbca5372baa67adb5c 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 -r 7794e13c6a7e -r da1848f07c6a Makefile --- a/Makefile Wed Jul 13 11:26:44 2016 -0400 +++ b/Makefile Wed Jul 13 10:39:33 2016 -0400 @@ -156,7 +156,7 @@ # 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 -r 7794e13c6a7e -r da1848f07c6a tests/test-mac-packages.t --- a/tests/test-mac-packages.t Wed Jul 13 11:26:44 2016 -0400 +++ b/tests/test-mac-packages.t Wed Jul 13 10:39:33 2016 -0400 @@ -43,5 +43,11 @@ $ 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 + $ bsdtar xf mercurial.pkg/Payload usr/local/bin +Use a glob to find this to avoid check-code whining about a fixed path. + $ head -n 1 usr/local/b?n/hg + #!/System/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python + Note that we're not currently installing any /etc/mercurial stuff, including merge-tool configurations.