Skip to content

Commit 02604b7

Browse files
authored
Add tbb as a submodule and update to version 2022.0.0 (#1934)
1 parent 45b041b commit 02604b7

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,7 @@
6464
path = builder/third_party/c-ares
6565
url = https://github.com/c-ares/c-ares.git
6666
branch = main
67+
[submodule "builder/third_party/tbb"]
68+
path = builder/third_party/tbb
69+
url = https://github.com/oneapi-src/oneTBB.git
70+
branch = master

builder/install/60-tbb.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ if [ -n "${WITH_RHEL_RPMS}" ]; then
77
exit 0
88
fi
99

10-
git clone --branch "$TBB_VERSION" --depth 1 https://github.com/intel/tbb
11-
cd tbb
12-
cp LICENSE "${LICENSE_DIR}/tbb-${TBB_VERSION}"
13-
make ${NPROCS:+-j ${NPROCS}} tbb_build_dir=./build tbb_build_prefix=lib extra_inc=big_iron.inc
14-
mkdir -p /usr/local/include
15-
cp -r ./include/tbb /usr/local/include/
16-
cp ./build/lib_release/libtbb.a /usr/local/lib/
10+
cd third_party/tbb
11+
cp LICENSE.txt "${LICENSE_DIR}/tbb-${TBB_VERSION}"
12+
cmake -B cmake-build -S . \
13+
-DCMAKE_BUILD_TYPE=Release \
14+
-DCMAKE_INSTALL_PREFIX=/usr/local \
15+
-DBUILD_SHARED_LIBS=OFF \
16+
-DTBB_TEST=OFF \
17+
-DTBBMALLOC_BUILD=OFF
18+
cmake --build cmake-build --target install ${NPROCS:+-j ${NPROCS}}

builder/install/versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export GRPC_REVISION=v1.67.0
77
export JSONCPP_REVISION=1.9.6
88
export PROMETHEUS_CPP_REVISION=v1.2.4
99
export PROTOBUF_VERSION=v28.3
10-
export TBB_VERSION=2018_U5
10+
export TBB_VERSION=2022.0.0
1111
export CIVETWEB_VERSION=v1.16
1212
export ABSEIL_VERSION=20240722.0
1313
export VALIJSON_VERSION=0.6

builder/third_party/tbb

Submodule tbb added at 0c0ff19

0 commit comments

Comments
 (0)