[Bf-blender-cvs] [57281b73c45] master: Install_deps: Always re-create shortcuts to installed lib paths.
Bastien Montagne
noreply at git.blender.org
Tue Aug 3 17:24:41 CEST 2021
Commit: 57281b73c45197ccf78476b73ed85a3ea30699e9
Author: Bastien Montagne
Date: Tue Aug 3 17:20:25 2021 +0200
Branches: master
https://developer.blender.org/rB57281b73c45197ccf78476b73ed85a3ea30699e9
Install_deps: Always re-create shortcuts to installed lib paths.
For some reasons looks like those shortcuts could get out of sync, which
created weird hard to understand building errors.
So for sake of simplicity and security, just re-create them all the
time, just like we update ld paths.
===================================================================
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 26281887e1f..ff4aad79bb6 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1447,9 +1447,7 @@ compile_Python() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "Python--$PYTHON_VERSION failed to compile, exiting"
exit 1
fi
@@ -1465,6 +1463,9 @@ compile_Python() {
INFO "If you want to force rebuild of this lib, use the --force-python option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "python-$PYTHON_VERSION_SHORT"
# Extra step: install required modules with pip.
@@ -1558,9 +1559,7 @@ compile_Boost() {
--prefix=$_inst --disable-icu boost.locale.icu=off install
./b2 --clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "Boost-$BOOST_VERSION failed to compile, exiting"
exit 1
fi
@@ -1574,7 +1573,9 @@ compile_Boost() {
INFO "If you want to force rebuild of this lib, use the --force-boost option."
fi
- # Just always run it, much simpler this way!
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "boost"
}
@@ -1687,9 +1688,7 @@ compile_TBB() {
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "TBB-$TBB_VERSION$TBB_VERSION_UPDATE failed to compile, exiting"
exit 1
fi
@@ -1703,6 +1702,9 @@ compile_TBB() {
INFO "If you want to force rebuild of this lib, use the --force-tbb option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "tbb"
}
@@ -1822,9 +1824,7 @@ compile_OCIO() {
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenColorIO-$OCIO_VERSION failed to compile, exiting"
exit 1
fi
@@ -1838,6 +1838,9 @@ compile_OCIO() {
INFO "If you want to force rebuild of this lib, use the --force-ocio option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "ocio"
}
@@ -1953,9 +1956,7 @@ compile_OPENEXR() {
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenEXR-$OPENEXR_VERSION failed to compile, exiting"
exit 1
fi
@@ -1971,7 +1972,9 @@ compile_OPENEXR() {
_with_built_openexr=true
- # Just always run it, much simpler this way!
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "openexr"
}
@@ -2112,9 +2115,7 @@ compile_OIIO() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenImageIO-$OIIO_VERSION failed to compile, exiting"
exit 1
fi
@@ -2128,7 +2129,9 @@ compile_OIIO() {
INFO "If you want to force rebuild of this lib, use the --force-oiio option."
fi
- # Just always run it, much simpler this way!
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "oiio"
}
@@ -2237,9 +2240,7 @@ compile_LLVM() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "LLVM-$LLVM_VERSION failed to compile, exiting"
exit 1
fi
@@ -2252,6 +2253,10 @@ compile_LLVM() {
INFO "Own LLVM-$LLVM_VERSION (CLANG included) is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib, use the --force-llvm option."
fi
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
}
# ----------------------------------------------------------------------------
@@ -2390,9 +2395,7 @@ compile_OSL() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenShadingLanguage-$OSL_VERSION failed to compile, exiting"
exit 1
fi
@@ -2406,6 +2409,9 @@ compile_OSL() {
INFO "If you want to force rebuild of this lib, use the --force-osl option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "osl"
}
@@ -2506,9 +2512,7 @@ compile_OSD() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenSubdiv-$OSD_VERSION failed to compile, exiting"
exit 1
fi
@@ -2522,6 +2526,9 @@ compile_OSD() {
INFO "If you want to force rebuild of this lib, use the --force-osd option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "osd"
}
@@ -2611,9 +2618,7 @@ compile_BLOSC() {
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "Blosc-$OPENVDB_BLOSC_VERSION failed to compile, exiting"
exit 1
fi
@@ -2626,6 +2631,9 @@ compile_BLOSC() {
magic_compile_set blosc-$OPENVDB_BLOSC_VERSION $blosc_magic
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "blosc"
}
@@ -2716,9 +2724,7 @@ install_NanoVDB() {
#~ mkdir -p $_inst
#~ cp -r $_src/include $_inst/include
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "NanoVDB-v$OPENVDB_VERSION failed to install, exiting"
exit 1
fi
@@ -2730,6 +2736,10 @@ install_NanoVDB() {
else
INFO "Own NanoVDB-v$OPENVDB_VERSION is up to date, nothing to do!"
fi
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
}
@@ -2849,9 +2859,7 @@ compile_OPENVDB() {
make -j$THREADS install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenVDB-$OPENVDB_VERSION failed to compile, exiting"
exit 1
fi
@@ -2865,6 +2873,9 @@ compile_OPENVDB() {
INFO "If you want to force rebuild of this lib, use the --force-openvdb option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "openvdb"
if [ "$WITH_NANOVDB" = true ]; then
@@ -2962,9 +2973,7 @@ compile_ALEMBIC() {
make -j$THREADS install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "Alembic-$ALEMBIC_VERSION failed to compile, exiting"
exit 1
fi
@@ -2978,6 +2987,9 @@ compile_ALEMBIC() {
INFO "If you want to force rebuild of this lib, use the --force-alembic option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "alembic"
}
@@ -3062,9 +3074,7 @@ compile_USD() {
make -j$THREADS install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "USD-$USD_VERSION failed to compile, exiting"
exit 1
fi
@@ -3078,6 +3088,9 @@ compile_USD() {
INFO "If you want to force rebuild of this lib, use the --force-usd option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "usd"
}
@@ -3171,9 +3184,7 @@ compile_OpenCOLLADA() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenCOLLADA-$OPENCOLLADA_VERSION failed to compile, exiting"
exit 1
fi
@@ -3186,6 +3197,10 @@ compile_OpenCOLLADA() {
INFO "Own OpenCOLLADA-$OPENCOLLADA_VERSION is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib, use the --force-opencollada option."
fi
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
}
# ----------------------------------------------------------------------------
@@ -3286,9 +3301,7 @@ compile_Embree() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "Embree-$EMBREE_VERSION failed to compile, exiting"
exit 1
fi
@@ -3301,6 +3314,10 @@ compile_Embree() {
INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib, use the --force-embree option."
fi
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
}
# ----------------------------------------------------------------------------
@@ -3363,9 +3380,7 @@ install_ISPC() {
mkdir -p $_inst
cp -r $_src/bin $_inst/bin
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "ISPC-v$ISPC_VERSION failed to install, exiting"
exit 1
fi
@@ -3378,6 +3393,10 @@ install_ISPC() {
INFO "Own ISPC-v$ISPC_VERSION is up to date, nothing to do!"
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
+
_ispc_path_bin=$_inst/bin
run_ldconfig "ispc"
}
@@ -3477,9 +3496,7 @@ compile_OIDN() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
exit 1
fi
@@ -3493,6 +3510,9 @@ compile_OIDN() {
INFO "If you want to force rebuild of this lib, use the --force-oidn option."
fi
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ fi
run_ldconfig "oidn"
}
@@ -3609,9 +3629,7 @@ compile_FFmpeg() {
make -j$THREADS && make install
make clean
- if [ -d $_inst ]; then
- _create_inst_shortcut
- else
+ if [ ! -d $_inst ]; then
ERROR "FFmpeg-$FFMPEG_VERSION failed to compile, exiting"
exit 1
fi
@@ -3624,6 +3642,10 @@ compile_FFmpeg() {
INFO "Own ffmpeg-$FFMPEG_VERSION is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib, use the --force-ffmpeg option."
fi
+
+ if [ -d $_inst ]; then
+ _creat
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list