From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Wed, 24 Sep 2008 17:42:55 +0000 (-0700)
Subject: setup: fix site-dirs to find system installed twisted on mac.
X-Git-Url: https://git.rkrishnan.org/vdrive/global?a=commitdiff_plain;h=5882ce99f4fba678b0b52533c30b6cc63bb67909;p=tahoe-lafs%2Ftahoe-lafs.git

setup: fix site-dirs to find system installed twisted on mac.

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
---

diff --git a/setup.py b/setup.py
index b2008975..e4773f4e 100644
--- 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: