Permalink
Browse files

pyqt: Generate PyQt4.pyqtconfig

This is no longer generated by the new (recommended) configure-ng.py but
some older projects (like PyQWT) still need that file, so we first
run configure.py and copy over the generated pyqtconfig.py manually.
Then, we normally run and build with configure-ng.py.

Fixes #21984
  • Loading branch information...
1 parent c0a748c commit c2eef84bed3a3657662020d6ff6840a09a7bab7b @samueljohn samueljohn committed Sep 4, 2013
Showing with 10 additions and 4 deletions.
  1. +10 −4 Library/Formula/pyqt.rb
View
@@ -18,10 +18,16 @@ class Pyqt < Formula
def install
python do
- system python, "./configure-ng.py", "--confirm-license",
- "--bindir=#{bin}",
- "--destdir=#{lib}/#{python.xy}/site-packages",
- "--sipdir=#{share}/sip#{python.if3then3}"
+ args = [ "--confirm-license",
+ "--bindir=#{bin}",
+ "--destdir=#{lib}/#{python.xy}/site-packages",
+ "--sipdir=#{share}/sip#{python.if3then3}" ]
+ # We need to run "configure.py" so that pyqtconfig.py is generated and
+ # PyQWT needs that. But to do the actual compile, we use the newer
+ # "configure-ng.py" that is recommened in the README.
+ system python, "configure.py", *args
+ (python.site_packages/'PyQt4').install 'pyqtconfig.py'
+ system python, "./configure-ng.py", *args
system "make"
system "make", "install"
system "make", "clean" # because this python block may be run twice

0 comments on commit c2eef84

Please sign in to comment.