diff options
| author | Mike McQuaid | 2014-02-10 14:45:44 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-02-10 18:49:50 +0000 |
| commit | fe4e5229299c531f79f73e8d0df6ed8b9a28c659 (patch) | |
| tree | 413d4f55338f5bac1c3e8c5f87b0d72fe42e00f1 /Library/Formula | |
| parent | 63293d8055bbb89a86d5a61ab7ea6636c9756ac8 (diff) | |
| download | homebrew-fe4e5229299c531f79f73e8d0df6ed8b9a28c659.tar.bz2 | |
pyqt5: more python cleanup.
Closes #26540.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/pyqt5.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Library/Formula/pyqt5.rb b/Library/Formula/pyqt5.rb index 45f14b3ed..7a3a03201 100644 --- a/Library/Formula/pyqt5.rb +++ b/Library/Formula/pyqt5.rb @@ -10,8 +10,14 @@ class Pyqt5 < Formula depends_on :python3 => :recommended depends_on :python => :optional - if (build.without? "python") && (build.without? "python3") - odie "pyqt: --with-python must be specified when using --without-python3" + if !Formula.factory("python").installed? && build.with?("python") && + build.with?("python3") + odie <<-EOS.undent + pyqt5: You cannot use system Python 2 and Homebrew's Python 3 simultaneously. + Either `brew install python` or use `--without-python3`. + EOS + elsif build.without?("python3") && build.without?("python") + odie "pyqt5: --with-python3 must be specified when using --without-python" end depends_on 'qt5' @@ -34,11 +40,10 @@ class Pyqt5 < Formula def install pythons.each do |python, version| - ENV["PYTHONPATH"] = lib/"python#{version}/site-packages" args = [ "--confirm-license", "--bindir=#{bin}", "--destdir=#{lib}/python#{version}/site-packages", - # To avoid conflicst with PyQt (for Qt4): + # To avoid conflicts with PyQt (for Qt4): "--sipdir=#{share}/sip/Qt5/", # sip.h could not be found automatically "--sip-incdir=#{Formula.factory('sip').opt_prefix}/include", |