tbb: 4.2 update 3

Also as far as I can tell the patch is no longer needed.

Closes #28140.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 3 insertions, 23 deletions

diff --git a/Library/Formula/tbb.rb b/Library/Formula/tbb.rb
index 1babde194..093f2a1c3 100644
--- a/Library/Formula/tbb.rb
+++ b/Library/Formula/tbb.rb
@@ -2,9 +2,9 @@ require 'formula'
 
 class Tbb < Formula
   homepage 'http://www.threadingbuildingblocks.org/'
-  url 'https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb42_20130725oss_src.tgz'
-  sha1 'f354bd9b67295f65c43531b751e34f483ed8a024'
-  version '4.2'
+  url 'https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb42_20140122oss_src.tgz'
+  sha1 'd897a6ced4f425c6608422a2e19218898e727260'
+  version '4.2.3'
 
   option :cxx11
 
@@ -12,11 +12,6 @@ class Tbb < Formula
     cause 'llvm is not supported on macos. Add build/macos.llvm.inc file with compiler-specific settings.'
   end
 
-  # tbb uses the wrong command (-v, verbose) to fetch the version from the
-  # compiler, causing problems if the compiler returns additional debug info
-  # Reported upstream at http://software.intel.com/en-us/forums/topic/475120
-  patch :DATA
-
   def install
     # Intel sets varying O levels on each compile command.
     ENV.no_optimization
@@ -33,18 +28,3 @@ class Tbb < Formula
     include.install 'include/tbb'
   end
 end
-
-__END__
-diff --git a/build/version_info_macos.sh b/build/version_info_macos.sh
-index 5970aad..20c863a 100644
---- a/build/version_info_macos.sh
-+++ b/build/version_info_macos.sh
-@@ -31,7 +31,7 @@ echo "#define __TBB_VERSION_STRINGS(N) \\"
- echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`arch`")"'" ENDL \'
- echo '#N": BUILD_OS'"\t\t"`sw_vers -productName`" version "`sw_vers -productVersion`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -v`'" ENDL \'
--echo '#N": BUILD_GCC'"\t\t"`gcc -v </dev/null 2>&1 | grep 'version'`'" ENDL \'
-+echo '#N": BUILD_GCC'"\t\t"`gcc --version </dev/null 2>&1 | head -1`'" ENDL \'
- [ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
- echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \'
- echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \'