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>
This commit is contained in:
parent
0a7e74b23c
commit
cf391f4bfd
2 changed files with 20 additions and 6 deletions
|
@ -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"
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in a new issue