Really use venv python when building scrypt rpm rpm-0.4-5
authorRyan Kelly <rfkelly@mozilla.com>
Wed, 16 Jul 2014 18:15:33 +1000
changeset 264 db7e0528263ef69032285dc202791bb196f8c11b
parent 262 4f458751c2de71b5d431cdff2a0e65bca2c3e61c
child 265 ae8ed69cb9214a134441f70391bfdb1b6f3e133a
push id175
push userrkelly@mozilla.com
push dateWed, 16 Jul 2014 08:27:57 +0000
Really use venv python when building scrypt rpm
Makefile
--- a/Makefile
+++ b/Makefile
@@ -101,17 +101,17 @@ lint:
 	- $(PYLINT) -f parseable --rcfile=pylintrc $(PKGS) > pylint.txt
 
 build_rpms:
 	rm -rf rpms
 	mkdir -p ${BUILD_TMP}
 	$(BUILDRPMS) -c $(RPM_CHANNEL) $(PYPIOPTIONS) $(DEPS)
 	# py-scrypt doesn't play nicely with pypi2rpm.
 	cd ${BUILD_TMP}; tar -xzvf $(CURDIR)/upstream-deps/py-scrypt-0.6.0.tar.gz
-	cd ${BUILD_TMP}; ./bin/python setup.py  --command-packages=pypi2rpm.command bdist_rpm2 --binary-only --name=python26-scrypt --dist-dir=$(CURDIR)/rpms
+	cd ${BUILD_TMP}; $(CURDIR)/bin/python setup.py  --command-packages=pypi2rpm.command bdist_rpm2 --binary-only --name=python26-scrypt --dist-dir=$(CURDIR)/rpms
 
 mach: build build_rpms
 	mach clean
 	mach yum install python26 python26-setuptools
 	cd rpms; wget http://mrepo.mozilla.org/mrepo/5-x86_64/RPMS.mozilla-services/gunicorn-0.11.2-1moz.x86_64.rpm
 	cd rpms; wget http://mrepo.mozilla.org/mrepo/5-x86_64/RPMS.mozilla/nginx-0.7.65-4.x86_64.rpm
 	mach yum install rpms/*
 	mach chroot python2.6 -m keyexchange.run