adjusting hostpython path for recipes that use setuptools where it is available

Ryan Northey · Ryan Northey · commit 8ab6ebbac9a1 · 2012-03-14T15:45:00.000Z
diff --git a/recipes/twisted/recipe.sh b/recipes/twisted/recipe.sh
@@ -23,12 +23,15 @@ function build_twisted() {
 	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	export LDSHARED="$LIBLINK"
 
+	export PYTHONPATH=$BUILD_PATH/hostpython/Python-2.7.2/Lib/site-packages
+
 	# fake try to be able to cythonize generated files
 	$BUILD_PATH/python-install/bin/python.host setup.py build_ext
 	try find . -iname '*.pyx' -exec cython {} \;
 	try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -v
 	try find build/lib.* -name "*.o" -exec $STRIP {} \;
-	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
+
+        try $BUILD_PATH/hostpython/Python-2.7.2/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
 
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/twisted/test
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/twisted/*/test
diff --git a/recipes/zope/recipe.sh b/recipes/zope/recipe.sh
@@ -13,7 +13,7 @@ function prebuild_zope() {
 
 function build_zope() {
 
-	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/zope" ]; then
+	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/zope/interface" ]; then
 		return
 	fi
 
@@ -23,8 +23,10 @@ function build_zope() {
 
 	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	export LDSHARED="$LIBLINK"
+	export PYTHONPATH=$BUILD_PATH/hostpython/Python-2.7.2/Lib/site-packages
+
+        try $BUILD_PATH/hostpython/Python-2.7.2/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
 
-	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/zope/interface/tests
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/zope/interface/*.txt
 
