From 88c747dd5ab61c12f846c4d796170de63a985767 Mon Sep 17 00:00:00 2001 From: Nibbles 2bits Date: Thu, 27 Oct 2011 13:20:11 -0700 Subject: [PATCH] tbb 4.0u1 This commit updates tbb to 4.0u1, which stands for Update 1. Intel has been releasing for 3.x: Update 1, Update 2, Update 3.... The previous formula here was 3.x Update 8 (it went to 10). They have been naming file archives based on the date the file was uploaded, but that can change and our previous tarball is gone. This compiles without error using gcc, clang, and llvm from XCode-4.0.2 on 64bit Snow Leopard. EDIT: added ENV.cc, ENV.cxx, and ENV.no_optimization Closes Homebrew/homebrew#8355. Signed-off-by: Jack Nagel --- Formula/tbb.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Formula/tbb.rb b/Formula/tbb.rb index 0b5d88382af..96630703838 100644 --- a/Formula/tbb.rb +++ b/Formula/tbb.rb @@ -1,17 +1,20 @@ require 'formula' class Tbb < Formula - url 'http://www.threadingbuildingblocks.org/uploads/78/172/3.0%20update%208/tbb30_221oss_src.tgz' - version '30_221' + url 'http://threadingbuildingblocks.org/uploads/77/177/4.0%20update%201/tbb40_20111003oss_src.tgz' + version '4.0u1' homepage 'http://www.threadingbuildingblocks.org/' - sha1 '79c6b347f457e3176a5beae598a14b3a25bac4a0' + sha1 '1155b2fa6d5f2f92a766ca7919951992d37c1e08' def install + # Intel sets varying O levels on each compile command. + ENV.no_optimization # Override build prefix so we can copy the dylibs out of the same place - # no matter what system we're on - args = ['tbb_build_prefix=BUILDPREFIX'] + # no matter what system we're on, and use our compilers. + args = ['tbb_build_prefix=BUILDPREFIX', + "CONLY=#{ENV.cc}", + "CPLUS=#{ENV.cxx}"] args << (MacOS.prefer_64_bit? ? "arch=intel64" : "arch=ia32") - system "make", *args lib.install Dir['build/BUILDPREFIX_release/*.dylib'] include.install 'include/tbb'