diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-05-13 01:17:14 +0300 |
---|---|---|
committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-05-13 01:17:14 +0300 |
commit | b72aef92c4fce0c7fc7cf6fca111d085ede99dbe (patch) | |
tree | 297d0abf46fc261b2888392b73f053f0b9c00599 /build_files/build_environment/install_deps.sh | |
parent | 3c85e1ca1a916fe2ded9ab508f4cd55a2ee22549 (diff) |
install_deps: Avoid conflicts on Arch-based systems when gcc-multilib is installed
install_deps can fail due to conflict between gcc (referenced by base-devel) and
gcc-multilib if the latter is installed. This avoids the conflict by filtering
the contents of base-devel when needed.
Reviewers: mont29
Differential Revision: https://developer.blender.org/D1944
Diffstat (limited to 'build_files/build_environment/install_deps.sh')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 6b9ac8f00fc..b3d659313d4 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -3342,7 +3342,15 @@ install_ARCH() { OGG_DEV="libogg" THEORA_DEV="libtheora" - _packages="base-devel git cmake \ + BASE_DEVEL="base-devel" + + # Avoid conflicts when gcc-multilib is installed + pacman -Qi gcc-multilib &>/dev/null + if [ $? -eq 0 ]; then + BASE_DEVEL=`pacman -Sgq base-devel | sed -e 's/^gcc$/gcc-multilib/g' | paste -s -d' '` + fi + + _packages="$BASE_DEVEL git cmake \ libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \ $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl fftw intel-tbb \ libxml2 yaml-cpp tinyxml python-requests jemalloc" |