diff options
| author | Mike McQuaid | 2014-01-04 13:16:25 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-01-04 13:35:47 +0000 |
| commit | 025069ab4640a78af70a96b683792bee85e458ad (patch) | |
| tree | c25c095447eaab03d8c0a632b9068ac24c1e61ae /Library/Formula | |
| parent | 6fb08707509962c14b428539722c083ebc8f898a (diff) | |
| download | homebrew-025069ab4640a78af70a96b683792bee85e458ad.tar.bz2 | |
shiboken: cleanup python usage.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/shiboken.rb | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/Library/Formula/shiboken.rb b/Library/Formula/shiboken.rb index 3a51eb6b9..604500cb4 100644 --- a/Library/Formula/shiboken.rb +++ b/Library/Formula/shiboken.rb @@ -9,8 +9,6 @@ class Shiboken < Formula head 'git://gitorious.org/pyside/shiboken.git' depends_on 'cmake' => :build - depends_on :python => :recommended - depends_on :python3 => :optional depends_on 'qt' def patches @@ -21,44 +19,20 @@ class Shiboken < Formula end def install - # This block will be run for each python (2.x and 3.x if requested)! - python do - # As of 1.1.1 the install fails unless you do an out of tree build and put - # the source dir last in the args. - mkdir "macbuild#{python.if3then3}" do - args = std_cmake_args - # Building the tests also runs them. - args << "-DBUILD_TESTS=ON" - # For Xcode-only systems, the headers of system's python are inside of Xcode: - args << "-DPYTHON#{python.if3then3}_INCLUDE_DIR='#{python.incdir}'" - # Cmake picks up the system's python dylib, even if we have a brewed one: - args << "-DPYTHON#{python.if3then3}_LIBRARY='#{python.libdir}/lib#{python.xy}.dylib'" - args << "-DUSE_PYTHON3=ON" if python3 - args << '..' - system 'cmake', *args - system "make install" - # To support 2.x and 3.x in parallel, we have to rename shiboken.pc at first - mv lib/'pkgconfig/shiboken.pc', lib/"pkgconfig/shiboken-py#{python.version.major}.pc" - end - end - # Rename shiboken-py2.pc back to the default shiboken.pc - mv lib/'pkgconfig/shiboken-py2.pc', lib/'pkgconfig/shiboken.pc' if python2 - end - - def caveats - if python3 - <<-EOS.undent - If you build software that uses the pkgconfig file, and you want - shiboken with Python 3.x support: Please, instead of 'shiboken.pc', use: - #{HOMEBREW_PREFIX}/lib/pkgconfig/shiboken-py3.pc - EOS + # As of 1.1.1 the install fails unless you do an out of tree build and put + # the source dir last in the args. + mkdir "macbuild" do + args = std_cmake_args + # Building the tests also runs them. + args << "-DBUILD_TESTS=ON" + args << '..' + system 'cmake', *args + system "make install" end end test do - python do - system python, "-c", "import shiboken" - end + system "python", "-c", "import shiboken" end end |
