diff options
Diffstat (limited to 'Library/Formula/sip.rb')
| -rw-r--r-- | Library/Formula/sip.rb | 104 |
1 files changed, 29 insertions, 75 deletions
diff --git a/Library/Formula/sip.rb b/Library/Formula/sip.rb index 8f4841259..31bb36571 100644 --- a/Library/Formula/sip.rb +++ b/Library/Formula/sip.rb @@ -1,12 +1,5 @@ require 'formula' -# NOTE TO MAINTAINERS: -# -# Unless Riverbank policy changes in the future or the Mercurial archive -# becomes unavailable, *do not use* the SIP download URL from the Riverbank -# website. This URL will break as soon as a new version of SIP is released -# which causes panic and terror to flood the Homebrew issue tracker. - class Sip < Formula homepage 'http://www.riverbankcomputing.co.uk/software/sip' url 'http://download.sf.net/project/pyqt/sip/sip-4.14.6/sip-4.14.6.tar.gz' @@ -14,85 +7,46 @@ class Sip < Formula head 'http://www.riverbankcomputing.co.uk/hg/sip', :using => :hg - def patches; DATA; end if build.head? + depends_on :python => :recommended + depends_on :python3 => :optional def install if build.head? - # Set fallback version to the same value it would have without the patch - # and link the Mercurial repository into the download directory so + # Link the Mercurial repository into the download directory so # buid.py can use it to figure out a version number. - sip_version = "0.1.0" ln_s downloader.cached_location + '.hg', '.hg' - inreplace 'build.py', /@SIP_VERSION@/, sip_version.to_s.gsub('.', ',') - system "python", "build.py", "prepare" + system python, "build.py", "prepare" else sip_version = version end - system "python", "configure.py", - "--destdir=#{lib}/#{which_python}/site-packages", - "--bindir=#{bin}", - "--incdir=#{include}", - "--sipdir=#{HOMEBREW_PREFIX}/share/sip", - "CFLAGS=#{ENV.cflags}", - "LFLAGS=#{ENV.ldflags}" - system "make install" - end + # The python block is run once for each python (2.x and 3.x if requested) + python do + # To have sip (for 2.x) and sip3 for python3, we rename the sip binary: + inreplace "configure.py", 'os.path.join(opts.sipbindir, "sip")', "os.path.join(opts.sipbindir, 'sip3')" if python3 + + # Set --destdir such that the python modules will be in the HOMEBREWPREFIX/lib/pythonX.Y/site-packages + system python, "configure.py", + "--destdir=#{lib}/#{python.xy}/site-packages", + "--bindir=#{bin}", + "--incdir=#{include}", + "--sipdir=#{HOMEBREW_PREFIX}/share/sip#{python.if3then3}" + system "make" + if python3 + bin.mkdir unless bin.exist? + bin.install 'sipgen/sip' => 'sip3' + end + system "make install" + system "make clean" + end - def caveats; <<-EOS.undent - For non-homebrew Python, you need to amend your PYTHONPATH like so: - export PYTHONPATH=#{HOMEBREW_PREFIX}/lib/#{which_python}/site-packages:$PYTHONPATH - EOS end - def which_python - "python" + `python -c 'import sys;print(sys.version[:3])'`.strip + def caveats + s = '' + s += python.standard_caveats if python + s += "The sip-dir for Python #{python.version.major}.x is #{HOMEBREW_PREFIX}/share/sip#{python.if3then3}." + s end -end - -__END__ -Patch to allow the SIP build.py script to generate a reasonable version number -for installing from a Mercurial snapshot without the .hg directory from the -Mercurial repository. The install code hooks on to the @SIP_VERSION@ tag and -inserts a real version tuple - -diff --git a/build.py b/build.py -index 927d7f1..fdf13a3 100755 ---- a/build.py -+++ b/build.py -@@ -185,7 +185,7 @@ def _get_release(): - changelog = None - name = os.path.basename(_RootDir) - -- release_suffix = "-unknown" -+ release_suffix = "" - version = None - - parts = name.split('-') -@@ -198,7 +198,7 @@ def _get_release(): - - # Format the results. - if version is None: -- version = (0, 1, 0) -+ version = (@SIP_VERSION@) - - major, minor, micro = version - - -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 -@@ -1485,8 +1485,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") - +end |