ENV.rb: Always return integers from make_jobs

When referencing `Hardware.processor_count`, `ENV.make_jobs` will return an
integer. If referencing the environment variable `HOMEBREW_MAKE_JOBS`, it
returned a string.

Now, the function always returns an integer.

Fixes #12033.

3 files changed, 17 insertions, 11 deletions

diff --git a/Library/Formula/pyside.rb b/Library/Formula/pyside.rb
index b3aa9d915..29355b2fb 100644
--- a/Library/Formula/pyside.rb
+++ b/Library/Formula/pyside.rb
@@ -10,8 +10,8 @@ end
 
 class Pyside < Formula
   homepage 'http://www.pyside.org'
-  url 'http://www.pyside.org/files/pyside-qt4.7+1.1.0.tar.bz2'
-  md5 '233f0c6d2b3daf58cf88877d7f74557b'
+  url 'http://www.pyside.org/files/pyside-latest.tar.bz2'
+  md5 '0176d3746074afe47373d7302e1b4501'
 
   depends_on 'cmake' => :build
   depends_on 'shiboken'
@@ -23,9 +23,12 @@ class Pyside < Formula
     qt = Formula.factory 'qt'
     ENV.append_to_cflags "-F#{qt.prefix}/Frameworks"
 
-    # 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'
+    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
   end
 
   def caveats
diff --git a/Library/Formula/shiboken.rb b/Library/Formula/shiboken.rb
index d23473522..7f2ef1809 100644
--- a/Library/Formula/shiboken.rb
+++ b/Library/Formula/shiboken.rb
@@ -2,16 +2,19 @@ require 'formula'
 
 class Shiboken < Formula
   homepage 'http://www.pyside.org/docs/shiboken'
-  url 'http://pyside.org/files/shiboken-1.1.0.tar.bz2'
-  md5 '9c9d696c8c426fb5abf28a6bd3759558'
+  url 'http://www.pyside.org/files/shiboken-latest.tar.bz2'
+  md5 'fa451b6c4f3e06cce283a84550a96fd2'
 
   depends_on 'cmake' => :build
-  depends_on 'generatorrunner'
+  depends_on 'qt'
 
   def install
     # Building the tests also runs them. Not building and running tests cuts
     # install time in half.
-    system "cmake #{std_cmake_parameters} -DBUILD_TESTS=OFF ."
-    system "make install"
+    mkdir 'build'
+    chdir 'build' do
+      system "cmake .. #{std_cmake_parameters} -DBUILD_TESTS=OFF"
+      system "make install"
+    end
   end
 end
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 4eeba6b98..898da6237 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -432,7 +432,7 @@ Please take one of the following actions:
   def make_jobs
     # '-j' requires a positive integral argument
     if self['HOMEBREW_MAKE_JOBS'].to_i > 0
-      self['HOMEBREW_MAKE_JOBS']
+      self['HOMEBREW_MAKE_JOBS'].to_i
     else
       Hardware.processor_count
     end