aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorNibbles 2bits2011-10-27 13:20:11 -0700
committerJack Nagel2011-10-29 21:00:55 -0500
commit991515c9baaeb298d5146d208d95bcc0621b6f45 (patch)
treef6bca47f2df79de982340e3500218fcd72e389a9 /Library
parente79d3178a5cc813b4dac00ffebc0afa688277f3d (diff)
downloadhomebrew-991515c9baaeb298d5146d208d95bcc0621b6f45.tar.bz2
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 #8355. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/tbb.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/Library/Formula/tbb.rb b/Library/Formula/tbb.rb
index 0b5d88382..966307038 100644
--- a/Library/Formula/tbb.rb
+++ b/Library/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'