diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-26 23:07:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:46:37 +0300 |
| commit | 275ca01eac78b87d4759b671aecfd1c9ab577a91 (patch) | |
| tree | 2940031a53cde937a7a4b0564fd1ad4b7e436063 | |
| parent | 95de7b9a5fb378e77303fe401569e323cdd7896e (diff) | |
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*
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 9024ff056f3..9dde3481d8f 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -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 |