From c2eef84bed3a3657662020d6ff6840a09a7bab7b Mon Sep 17 00:00:00 2001 From: Samuel John Date: Wed, 4 Sep 2013 10:46:53 +0200 Subject: 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 --- Library/Formula/pyqt.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/pyqt.rb b/Library/Formula/pyqt.rb index 2d96dc8e4..155228349 100644 --- a/Library/Formula/pyqt.rb +++ b/Library/Formula/pyqt.rb @@ -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 -- cgit v1.2.3