setup: fix site-dirs to find system installed twisted on mac.
authorrobk-tahoe <robk-tahoe@allmydata.com>
Wed, 24 Sep 2008 17:42:55 +0000 (10:42 -0700)
committerrobk-tahoe <robk-tahoe@allmydata.com>
Wed, 24 Sep 2008 17:42:55 +0000 (10:42 -0700)
zooko helped me unravel a build weirdness today.  somehow the system installed
twisted (/System/Library) was pulling in parts of the other twisted (/Library)
which had been installed by easy_install, and exploding.

getting rid of the latter helped, but it took this change to get the tahoe
build to stop trying to rebuild twisted and instead use the one that was
already installed. c.f. tkt #229

setup.py

index b200897535b2d3c5636368af3990fa4926b5dffa..e4773f4ea269aef8b7caf0b2744715ff9013d7de 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -300,6 +300,10 @@ class BuildTahoe(Command):
         if sys.platform == "linux2":
             # workaround for tahoe #229 / setuptools #17, on debian
             command.extend(["--site-dirs", "/var/lib/python-support/" + pyver])
+        elif sys.platform == "darwin":
+            # this probably only applies to leopard 10.5, possibly only 10.5.5
+            sd = "/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python"
+            command.extend(["--site-dirs", sd])
         print "Command:", " ".join(command)
         rc = subprocess.call(command)
         if rc < 0: