wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "ENV.rb: Always return integers from make_jobs"

Browse source 
This reverts commit ea1a9e603abe3dab90bf5b157d2614cf58e2cc8e.

Argh. Unrelated PySide changes slipped in.
This commit is contained in:
Charlie Sharpsteen 2012-05-03 15:48:09 -07:00
parent f118b859d4
commit a33127cf09
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Formula/pyside.rb
View file

@ -10,8 +10,8 @@ end
class Pyside < Formula
homepage 'http://www.pyside.org'
url 'http://www.pyside.org/files/pyside-latest.tar.bz2'
md5 '0176d3746074afe47373d7302e1b4501'
url 'http://www.pyside.org/files/pyside-qt4.7+1.1.0.tar.bz2'
md5 '233f0c6d2b3daf58cf88877d7f74557b'
depends_on 'cmake' => :build
depends_on 'shiboken'
@ -23,12 +23,9 @@ class Pyside < Formula
qt = Formula.factory 'qt'
ENV.append_to_cflags "-F#{qt.prefix}/Frameworks"
mkdir 'build'
chdir 'build' do
# Also need `ALTERNATIVE_QT_INCLUDE_DIR` to prevent "missing file" errors.
system "cmake .. #{std_cmake_parameters} -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.prefix}/Frameworks -DSITE_PACKAGE=#{site_package_dir} -DBUILD_TESTS=NO"
system 'make install'
end
# Also need `ALTERNATIVE_QT_INCLUDE_DIR` to prevent "missing file" errors.
system "cmake #{std_cmake_parameters} -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.prefix}/Frameworks -DSITE_PACKAGE=#{site_package_dir} -DBUILD_TESTS=NO ."
system 'make install'
end
def caveats

13
Formula/shiboken.rb
View file

@ -2,19 +2,16 @@ require 'formula'
class Shiboken < Formula
homepage 'http://www.pyside.org/docs/shiboken'
url 'http://www.pyside.org/files/shiboken-latest.tar.bz2'
md5 'fa451b6c4f3e06cce283a84550a96fd2'
url 'http://pyside.org/files/shiboken-1.1.0.tar.bz2'
md5 '9c9d696c8c426fb5abf28a6bd3759558'
depends_on 'cmake' => :build
depends_on 'qt'
depends_on 'generatorrunner'
def install
# Building the tests also runs them. Not building and running tests cuts
# install time in half.
mkdir 'build'
chdir 'build' do
system "cmake .. #{std_cmake_parameters} -DBUILD_TESTS=OFF"
system "make install"
end
system "cmake #{std_cmake_parameters} -DBUILD_TESTS=OFF ."
system "make install"
end
end