forked from bartvdbraak/blender
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:
parent
8fcf774167
commit
9317f9c055
@ -2642,7 +2642,7 @@ install_DEB() {
|
|||||||
INFO "Forced LLVM building, as requested..."
|
INFO "Forced LLVM building, as requested..."
|
||||||
_do_compile_llvm=true
|
_do_compile_llvm=true
|
||||||
else
|
else
|
||||||
check_package_DEB llvm-$LLVM_VERSION-dev
|
check_package_DEB clang-$LLVM_VERSION
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
install_packages_DEB llvm-$LLVM_VERSION-dev clang-$LLVM_VERSION
|
install_packages_DEB llvm-$LLVM_VERSION-dev clang-$LLVM_VERSION
|
||||||
have_llvm=true
|
have_llvm=true
|
||||||
@ -3161,22 +3161,29 @@ install_RPM() {
|
|||||||
_do_compile_llvm=true
|
_do_compile_llvm=true
|
||||||
else
|
else
|
||||||
# Problem compiling with LLVM 3.2 so match version 3.1 ...
|
# 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
|
install_packages_RPM llvm-devel llvm-clang-devel
|
||||||
else
|
|
||||||
install_packages_RPM llvm-devel clang-devel
|
|
||||||
fi
|
|
||||||
have_llvm=true
|
have_llvm=true
|
||||||
LLVM_VERSION_FOUND=$LLVM_VERSION
|
LLVM_VERSION_FOUND=$LLVM_VERSION
|
||||||
clean_LLVM
|
clean_LLVM
|
||||||
else
|
else
|
||||||
#
|
|
||||||
# Better to compile it than use minimum version from repo...
|
# Better to compile it than use minimum version from repo...
|
||||||
#
|
|
||||||
_do_compile_llvm=true
|
_do_compile_llvm=true
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
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
|
fi
|
||||||
|
|
||||||
if [ "$_do_compile_llvm" = true ]; then
|
if [ "$_do_compile_llvm" = true ]; then
|
||||||
@ -3563,11 +3570,11 @@ install_ARCH() {
|
|||||||
INFO "Forced LLVM building, as requested..."
|
INFO "Forced LLVM building, as requested..."
|
||||||
_do_compile_llvm=true
|
_do_compile_llvm=true
|
||||||
else
|
else
|
||||||
check_package_version_match_ARCH llvm $LLVM_VERSION
|
check_package_version_match_ARCH clang $LLVM_VERSION
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
install_packages_ARCH llvm clang
|
install_packages_ARCH llvm clang
|
||||||
have_llvm=true
|
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
|
LLVM_VERSION_FOUND=$LLVM_VERSION
|
||||||
clean_LLVM
|
clean_LLVM
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user