blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T47939, take II: Check clang package version, not llvm-devel one. 

Looks like some distro still provide llvm-3.4-devel, while no more clang-3.4.
Since clang depends on llvm of same version, check clang only should ensure
us we also have matvhing llvm... *sigh*
This commit is contained in:
Bastien Montagne 2016-03-26 21:07:04 +01:00
parent 8fcf774167
commit 9317f9c055
Notes: blender-bot 2024-03-22 15:57:27 +01:00 
Referenced by issue #47939, Install Deps OSL 1.7.1 and clang-3.5
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build_files/build_environment/install_deps.sh
View File

@ -2642,7 +2642,7 @@ install_DEB() {
INFO "Forced LLVM building, as requested..."
_do_compile_llvm=true
else
check_package_DEB llvm-$LLVM_VERSION-dev
check_package_DEB clang-$LLVM_VERSION
if [ $? -eq 0 ]; then
install_packages_DEB llvm-$LLVM_VERSION-dev clang-$LLVM_VERSION
have_llvm=true
@ -3161,21 +3161,28 @@ install_RPM() {
_do_compile_llvm=true
else
# Problem compiling with LLVM 3.2 so match version 3.1 ...
check_package_version_match_RPM llvm $LLVM_VERSION
if [ $? -eq 0 ]; then
if [ "$RPM" = "SUSE" ]; then
if [ "$RPM" = "SUSE" ]; then
check_package_version_match_RPM llvm-clang-devel $LLVM_VERSION
if [ $? -eq 0 ]; then
install_packages_RPM llvm-devel llvm-clang-devel
have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
install_packages_RPM llvm-devel clang-devel
# Better to compile it than use minimum version from repo...
_do_compile_llvm=true
fi
have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
#
# Better to compile it than use minimum version from repo...
#
_do_compile_llvm=true
check_package_version_match_RPM clang-devel $LLVM_VERSION
if [ $? -eq 0 ]; then
install_packages_RPM llvm-devel clang-devel
have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
# Better to compile it than use minimum version from repo...
_do_compile_llvm=true
fi
fi
fi
@ -3563,11 +3570,11 @@ install_ARCH() {
INFO "Forced LLVM building, as requested..."
_do_compile_llvm=true
else
check_package_version_match_ARCH llvm $LLVM_VERSION
check_package_version_match_ARCH clang $LLVM_VERSION
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION=`check_package_version_ge_ARCH clang $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else