[Bf-blender-cvs] [0d0dcfd6434] master: Install_deps: Add support to compile TBB when we cannot find version.
Bastien Montagne
noreply at git.blender.org
Fri May 8 18:05:53 CEST 2020
Commit: 0d0dcfd64343930ba66e70c400cbd66f20a85b4f
Author: Bastien Montagne
Date: Fri May 8 18:03:24 2020 +0200
Branches: master
https://developer.blender.org/rB0d0dcfd64343930ba66e70c400cbd66f20a85b4f
Install_deps: Add support to compile TBB when we cannot find version.
We now want to use fairly recent TBB (2018 at least?), so distro a bit
old will not have required package anymore...
Tested with Debian, other distro "should work" (c), but tests there are
much welcome! ;)
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index fc9ee0102bb..5f73756ec0b 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -53,15 +53,15 @@ getopt \
--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
with-all,with-opencollada,with-jack,with-embree,with-oidn,\
ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-xr-openxr:,\
-force-all,force-python,force-numpy,force-boost,\
+force-all,force-python,force-numpy,force-boost,force-tbb,\
force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,force-usd,\
force-xr-openxr,\
-build-all,build-python,build-numpy,build-boost,\
+build-all,build-python,build-numpy,build-boost,build-tbb,\
build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-usd,\
build-xr-openxr,\
-skip-python,skip-numpy,skip-boost,\
+skip-python,skip-numpy,skip-boost,skip-tbb,\
skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd,\
skip-xr-openxr \
@@ -191,6 +191,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--build-boost
Force the build of Boost.
+ --build-tbb
+ Force the build of TBB.
+
--build-ocio
Force the build of OpenColorIO.
@@ -255,6 +258,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--force-boost
Force the rebuild of Boost.
+ --force-tbb
+ Force the rebuild of TBB.
+
--force-ocio
Force the rebuild of OpenColorIO.
@@ -312,6 +318,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--skip-boost
Unconditionally skip Boost installation/building.
+ --skip-tbb
+ Unconditionally skip TBB installation/building.
+
--skip-ocio
Unconditionally skip OpenColorIO installation/building.
@@ -385,6 +394,13 @@ BOOST_FORCE_BUILD=false
BOOST_FORCE_REBUILD=false
BOOST_SKIP=false
+TBB_VERSION="2019"
+TBB_VERSION_UPDATE="_U9" # Used for source packages...
+TBB_VERSION_MIN="2018"
+TBB_FORCE_BUILD=false
+TBB_FORCE_REBUILD=false
+TBB_SKIP=false
+
OCIO_VERSION="1.1.0"
OCIO_VERSION_MIN="1.0"
OCIO_FORCE_BUILD=false
@@ -653,6 +669,7 @@ while true; do
PYTHON_FORCE_BUILD=true
NUMPY_FORCE_BUILD=true
BOOST_FORCE_BUILD=true
+ TBB_FORCE_BUILD=true
OCIO_FORCE_BUILD=true
OPENEXR_FORCE_BUILD=true
OIIO_FORCE_BUILD=true
@@ -682,6 +699,9 @@ while true; do
--build-boost)
BOOST_FORCE_BUILD=true; shift; continue
;;
+ --build-tbb)
+ TBB_FORCE_BUILD=true; shift; continue
+ ;;
--build-ocio)
OCIO_FORCE_BUILD=true; shift; continue
;;
@@ -728,6 +748,7 @@ while true; do
PYTHON_FORCE_REBUILD=true
NUMPY_FORCE_REBUILD=true
BOOST_FORCE_REBUILD=true
+ TBB_FORCE_REBUILD=true
OCIO_FORCE_REBUILD=true
OPENEXR_FORCE_REBUILD=true
OIIO_FORCE_REBUILD=true
@@ -755,6 +776,9 @@ while true; do
--force-boost)
BOOST_FORCE_REBUILD=true; shift; continue
;;
+ --force-tbb)
+ TBB_FORCE_REBUILD=true; shift; continue
+ ;;
--force-ocio)
OCIO_FORCE_REBUILD=true; shift; continue
;;
@@ -806,6 +830,9 @@ while true; do
--skip-boost)
BOOST_SKIP=true; shift; continue
;;
+ --skip-tbb)
+ TBB_SKIP=true; shift; continue
+ ;;
--skip-ocio)
OCIO_SKIP=true; shift; continue
;;
@@ -901,6 +928,9 @@ _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
BOOST_SOURCE=( "https://dl.bintray.com/boostorg/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options"
+TBB_SOURCE=( "https://github.com/oneapi-src/oneTBB/archive/$TBB_VERSION$TBB_VERSION_UPDATE.tar.gz" )
+TBB_SOURCE_CMAKE=( "https://raw.githubusercontent.com/wjakob/tbb/master/CMakeLists.txt" )
+
OCIO_USE_REPO=false
OCIO_SOURCE=( "https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$OCIO_VERSION.tar.gz")
#~ OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
@@ -1011,6 +1041,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
* Python $PYTHON_VERSION_MIN (from $PYTHON_SOURCE).
* [NumPy $NUMPY_VERSION_MIN] (from $NUMPY_SOURCE).
* Boost $BOOST_VERSION_MIN (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
+ * TBB $TBB_VERSION_MIN (from $TBB_SOURCE).
* [FFMpeg $FFMPEG_VERSION_MIN (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, ...)] (from $FFMPEG_SOURCE).
* [OpenColorIO $OCIO_VERSION_MIN] (from $OCIO_SOURCE).
* ILMBase $OPENEXR_VERSION_MIN (from $OPENEXR_SOURCE).
@@ -1490,6 +1521,128 @@ compile_Boost() {
run_ldconfig "boost"
}
+# ----------------------------------------------------------------------------
+# Build TBB
+
+_init_tbb() {
+ _src=$SRC/TBB-$TBB_VERSION
+ _git=false
+ _inst=$INST/tbb-$TBB_VERSION
+ _inst_shortcut=$INST/tbb
+}
+
+_update_deps_tbb() {
+ OSD_FORCE_REBUILD=true
+ OPENVDB_FORCE_REBUILD=true
+ USD_FORCE_REBUILD=true
+ OIDN_FORCE_REBUILD=true
+ if [ "$_is_building" = true ]; then
+ OSD_FORCE_BUILD=true
+ OPENVDB_FORCE_BUILD=true
+ USD_FORCE_BUILD=true
+ OIDN_FORCE_BUILD=true
+ fi
+}
+
+clean_TBB() {
+ _init_tbb
+ if [ -d $_inst ]; then
+ _update_deps_tbb
+ fi
+ _clean
+}
+
+compile_TBB() {
+ if [ "$NO_BUILD" = true ]; then
+ WARNING "--no-build enabled, TBB will not be compiled!"
+ return
+ fi
+
+ # To be changed each time we make edits that would modify the compiled result!
+ tbb_magic=0
+ _init_tbb
+
+ # Clean install if needed!
+ magic_compile_check tbb-$TBB_VERSION $tbb_magic
+ if [ $? -eq 1 -o "$TBB_FORCE_REBUILD" = true ]; then
+ clean_TBB
+ fi
+
+ if [ ! -d $_inst ]; then
+ INFO "Building TBB-$TBB_VERSION$TBB_VERSION_UPDATE"
+ _is_building=true
+
+ # Rebuild dependencies as well!
+ _update_deps_tbb
+
+ prepare_opt
+
+ if [ ! -d $_src ]; then
+ INFO "Downloading TBB-$TBB_VERSION$TBB_VERSION_UPDATE"
+ mkdir -p $SRC
+
+ download TBB_SOURCE[@] $_src.tar.gz
+ INFO "Unpacking TBB-$TBB_VERSION$TBB_VERSION_UPDATE"
+ tar -C $SRC --transform "s,(.*/?)oneTBB[^/]*(.*),\1TBB-$TBB_VERSION\2,x" \
+ -xf $_src.tar.gz
+
+ INFO
+
+ # Super-hack: Add some cmake builder to tbb... since they don't even have an install target by default, sic.
+ download TBB_SOURCE_CMAKE[@] $_src/CMakeLists.txt
+ cp $_src/build/vs2013/version_string.ver $_src/build/version_string.ver.in
+ fi
+
+ cd $_src
+
+ # Always refresh the whole build!
+ if [ -d cmake_build ]; then
+ rm -rf cmake_build
+ fi
+ mkdir cmake_build
+ cd cmake_build
+
+ cmake_d="-D CMAKE_BUILD_TYPE=Release"
+ cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst"
+ cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+ cmake_d="$cmake_d -D TBB_BUILD_SHARED=ON"
+ cmake_d="$cmake_d -D TBB_BUILD_STATIC=OFF"
+ cmake_d="$cmake_d -D TBB_BUILD_TBBMALLOC=ON"
+ cmake_d="$cmake_d -D TBB_BUILD_TBBMALLOC_PROXY=OFF"
+ cmake_d="$cmake_d -D TBB_BUILD_TESTS=OFF"
+
+ if file /bin/cp | grep -q '32-bit'; then
+ cflags="-fPIC -m32 -march=i686"
+ else
+ cflags="-fPIC"
+ fi
+
+ cmake $cmake_d -D CMAKE_CXX_FLAGS="$cflags" -D CMAKE_EXE_LINKER_FLAGS="-lgcc_s -lgcc" ..
+
+ make -j$THREADS && make install
+
+ make clean
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ else
+ ERROR "TBB-$TBB_VERSION$TBB_VERSION_UPDATE failed to compile, exiting"
+ exit 1
+ fi
+
+ magic_compile_set tbb-$TBB_VERSION $tbb_magic
+
+ cd $CWD
+ INFO "Done compiling TBB-$TBB_VERSION$TBB_VERSION_UPDATE!"
+ _is_building=false
+ else
+ INFO "Own TBB-$TBB_VERSION$TBB_VERSION_UPDATE is up to date, nothing to do!"
+ INFO "If you want to force rebuild of this lib, use the --force-tbb option."
+ fi
+
+ run_ldconfig "tbb"
+}
+
# ----------------------------------------------------------------------------
# Build OCIO
@@ -2239,6 +2392,9 @@ compile_OSD() {
mkdir build
cd build
+ if [ -d $INST/tbb ]; then
+ cmake_d="$cmake_d $cmake_d -D TBB_LOCATION=$INST/tbb"
+ fi
cmake_d="-D CMAKE_BUILD_TYPE=Release"
cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
# ptex is only needed when nicholas bishop is ready
@@ -2450,6 +2606,9 @@ compile_OPENVDB() {
if [ -d $INST/boost ]; then
make_d="$make_d BOOST_INCL_DIR=$INST/boost/include BOOST_LIB_DIR=$INST/boost/lib"
fi
+ if [ -d $INST/tbb ]; then
+ make_d="$make_d TBB_ROOT=$INST/tbb TBB_USE_STATIC_LIBS=OFF"
+ fi
if [ "$_with_built_openexr" = true ]; then
make_d="$make_d ILMBASE_INCL_DIR=$INST/openexr/include ILMBASE_LIB_DIR=$INST/openexr/lib"
@@ -2655,6 +2814,10 @@ compile_USD() {
if [ -d $INST/boost ]; then
cmake_d="$cmake_d $cmake_d -D BOOST_ROOT=$INST/boost"
fi
+
+ if [ -d $INST/tbb ]; then
+ cmake_d="$cmake_d $cmake_d -D TBB_ROOT_DIR=$INST/tbb"
+ fi
cmake_d="$cmake_d -DPXR_SET_INTERNAL_NAMESPACE=usdBlender"
cmake_d="$cmake_d -DPXR_ENABLE_PYTHON_SUPPORT=OFF"
cmake_d="$cmake_d -DPXR_BUILD_IMAGING=OFF"
@@ -2983,6 +3146,10 @@ compile_OIDN() {
cmake_d="$cmake_d -D WITH_TEST=OFF"
cmake_d="$cmake_d -D OIDN_STATIC_LIB=ON"
+ if [ -d $INST/tbb ]; then
+ make_d="$make_d TBB_ROOT=$INST/tbb"
+ fi
+
cmake $cmake_d ../
make -j$THREADS && make install
@@ -3346,7 +3513,7 @@ install_DEB() {
THEORA_DEV="libtheora-dev"
_packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
- git libfreetype6-dev libx11-dev flex bison libtbb-dev libxxf86vm-dev \
+ git libfreetype6-dev libx11-dev flex bison libxxf86vm-dev \
libxcursor-dev libx
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list