Commits

Chris Jones authored f93d242cda7
tbb: correctly set stdlib
No tags

devel/tbb/Portfile

Modified
1 1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
2 2
3 3 PortSystem 1.0
4 4 PortGroup muniversal 1.0
5 5 PortGroup github 1.0
6 6 PortGroup compiler_blacklist_versions 1.0
7 7
8 8 github.setup 01org tbb 2019_U3
9 -revision 0
9 +revision 1
10 10 categories devel
11 11 platforms darwin
12 12 maintainers nomaintainer
13 13 license Apache-2
14 14
15 -description Intel Threading Building Blocks offers a rich and complete approach to parallelism in C++
15 +description Intel Threading Building Blocks offers a rich and complete approach \
16 + to parallelism in C++
16 17
17 18 long_description ${description} \
18 19 It represents a higher-level, task-based parallelism that abstracts \
19 20 platform details and threading mechanisms for scalability and performance
20 21
21 22 homepage https://www.threadingbuildingblocks.org/
22 23
23 24 checksums rmd160 1109bcf4105ccc0ba5e824a62b751e23bdfd4088 \
24 25 sha256 fe3282988202331c232672993fe5e8f06dbaa0e2d8da9eefe82768f311b1c13e \
25 26 size 2543510
26 27
27 28 github.livecheck.regex {(\d+(?:\_U)+(?:\d+)*)}
28 29
29 30 use_configure no
30 31
31 32 # Force a compatible compiler
32 33 compiler.blacklist-append *gcc* {clang < 602} macports-clang-3.3 macports-clang-3.4 \
33 34 macports-clang-3.7
34 -compiler.whitelist clang macports-clang-3.9
35 +compiler.whitelist clang macports-clang-5.0 macports-clang-3.9
35 36
36 37 set tbb_arch(i386) ia32
37 38 set tbb_arch(ppc) ppc32
38 39 set tbb_arch(x86_64) intel64
39 40 if {![info exists tbb_arch(${configure.build_arch})]} {
40 41 set tbb_arch(${configure.build_arch}) ${configure.build_arch}
41 42 }
42 43
43 44 if {[string match *clang* ${configure.compiler}]} {
44 45 set tbb_compiler clang
54 55 CONLY=${configure.cc} \
55 56 CPLUS=${configure.cxx}
56 57
57 58 post-patch {
58 59 # http://software.intel.com/en-us/forums/topic/505370
59 60 reinplace "/ -dynamiclib/s|$| -install_name ${prefix}/lib/\$@|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
60 61 }
61 62
62 63 build.target tbb tbbmalloc tbbproxy
63 64 build.args-append compiler=${tbb_compiler} \
65 + stdlib=${configure.cxx_stdlib} \
64 66 tbb_build_prefix=${tbb_build_prefix} \
65 67 use_proxy=1
66 68
67 69 test.run yes
68 70 test.target test
69 71 test.args-append ${build.args}
70 72
71 73 if {[variant_isset universal]} {
72 74 foreach arch ${configure.universal_archs} {
73 75 set merger_build_args(${arch}) arch=$tbb_arch(${arch})

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut