diff options
| author | Christopher | 2010-10-25 15:19:39 +0300 |
|---|---|---|
| committer | Adam Vandenberg | 2010-10-26 09:35:49 -0700 |
| commit | 3f16d53109a5df1f3ecd5302355e8aef4160626b (patch) | |
| tree | c3ca6933e6cb0ab25dacfcda9ff8cca3fa9c9886 | |
| parent | 8d834607f6f2317dec89a0d27b0c2df6140f1018 (diff) | |
| download | homebrew-3f16d53109a5df1f3ecd5302355e8aef4160626b.tar.bz2 | |
sip - removed check for Framework Python
removed the apparently unnecesary check for a framework build of python from
the sip build and stopped using system python for sip and pyqt
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/pyqt.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/sip.rb | 23 |
2 files changed, 20 insertions, 6 deletions
diff --git a/Library/Formula/pyqt.rb b/Library/Formula/pyqt.rb index 949737792..fb31af72c 100644 --- a/Library/Formula/pyqt.rb +++ b/Library/Formula/pyqt.rb @@ -14,8 +14,7 @@ class Pyqt <Formula def install ENV.prepend 'PYTHONPATH', "#{HOMEBREW_PREFIX}/lib/python", ':' - # SIP gets built against system python, so PyQt should as well. - system "/usr/bin/python", "./configure.py", "--confirm-license", + system "python", "./configure.py", "--confirm-license", "--bindir=#{bin}", "--destdir=#{lib}/python", "--sipdir=#{share}/sip" diff --git a/Library/Formula/sip.rb b/Library/Formula/sip.rb index becfbf2ce..76fb3e762 100644 --- a/Library/Formula/sip.rb +++ b/Library/Formula/sip.rb @@ -13,10 +13,8 @@ class Sip <Formula end def install - # Force building against System python, because we need a Framework build. - # See: http://github.com/mxcl/homebrew/issues/issue/930 - system "/usr/bin/python", "build.py", "prepare" - system "/usr/bin/python", "configure.py", + system "python", "build.py", "prepare" + system "python", "configure.py", "--destdir=#{lib}/python", "--bindir=#{bin}", "--incdir=#{include}" @@ -55,3 +53,20 @@ index 927d7f1..fdf13a3 100755 major, minor, micro = version + +Another patch to remove the seemingly unnecessary framework build requirement +diff --git a/siputils.py b/siputils.py +index 57e8911..1af6152 100644 +--- a/siputils.py ++++ b/siputils.py +@@ -1423,8 +1423,8 @@ class ModuleMakefile(Makefile): + # 'real_prefix' exists if virtualenv is being used. + dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep) + +- if "Python.framework" not in dl: +- error("SIP requires Python to be built as a framework") ++ # if "Python.framework" not in dl: ++ # error("SIP requires Python to be built as a framework") + + self.LFLAGS.append("-undefined dynamic_lookup") + |